回答編集履歴
2
ミス修正
answer
CHANGED
|
@@ -89,12 +89,12 @@
|
|
|
89
89
|
#[amp,ctr,wid]
|
|
90
90
|
|
|
91
91
|
# x1, y1 = detect_peak() ##
|
|
92
|
-
np_x, np_y = detect_peak()
|
|
92
|
+
np_x, np_y = detect_peak() ##
|
|
93
93
|
|
|
94
94
|
x2=float(input("x2"))
|
|
95
95
|
y2=float(input("y2"))
|
|
96
96
|
# guess = [] ##
|
|
97
|
-
guess = [[y1, x1, 1] for (x1, y1) in zip(np_x, np_y)]
|
|
97
|
+
guess = [[y1, x1, 1] for (x1, y1) in zip(np_x, np_y)] ##
|
|
98
98
|
# guess.append([y1, x1, 1]) ##
|
|
99
99
|
guess.append([y2, x2, 1])
|
|
100
100
|
|
|
@@ -124,4 +124,4 @@
|
|
|
124
124
|
```
|
|
125
125
|
|
|
126
126
|
|
|
127
|
-
編集(12/01 17:
|
|
127
|
+
編集(12/01 17:35) ##が変更点です
|
1
訂正
answer
CHANGED
|
@@ -87,12 +87,15 @@
|
|
|
87
87
|
|
|
88
88
|
#初期値のリストを作成
|
|
89
89
|
#[amp,ctr,wid]
|
|
90
|
-
x1, y1 = detect_peak()
|
|
91
90
|
|
|
91
|
+
# x1, y1 = detect_peak() ##
|
|
92
|
+
np_x, np_y = detect_peak()
|
|
93
|
+
|
|
92
94
|
x2=float(input("x2"))
|
|
93
95
|
y2=float(input("y2"))
|
|
94
|
-
guess = []
|
|
96
|
+
# guess = [] ##
|
|
97
|
+
guess = [[y1, x1, 1] for (x1, y1) in zip(np_x, np_y)]
|
|
95
|
-
guess.append([y1, x1, 1])
|
|
98
|
+
# guess.append([y1, x1, 1]) ##
|
|
96
99
|
guess.append([y2, x2, 1])
|
|
97
100
|
|
|
98
101
|
#バックグラウンドの初期値
|
|
@@ -118,4 +121,7 @@
|
|
|
118
121
|
plt.fill_between(x, i, baseline, facecolor=cm.rainbow(n/len(y_list)), alpha=0.6)
|
|
119
122
|
|
|
120
123
|
print(*popt)
|
|
121
|
-
```
|
|
124
|
+
```
|
|
125
|
+
|
|
126
|
+
|
|
127
|
+
編集(12/01 17:10) ##が変更点です
|