回答編集履歴
2
ミス修正
test
CHANGED
|
@@ -180,7 +180,7 @@
|
|
|
180
180
|
|
|
181
181
|
# x1, y1 = detect_peak() ##
|
|
182
182
|
|
|
183
|
-
np_x, np_y = detect_peak()
|
|
183
|
+
np_x, np_y = detect_peak() ##
|
|
184
184
|
|
|
185
185
|
|
|
186
186
|
|
|
@@ -190,7 +190,7 @@
|
|
|
190
190
|
|
|
191
191
|
# guess = [] ##
|
|
192
192
|
|
|
193
|
-
guess = [[y1, x1, 1] for (x1, y1) in zip(np_x, np_y)]
|
|
193
|
+
guess = [[y1, x1, 1] for (x1, y1) in zip(np_x, np_y)] ##
|
|
194
194
|
|
|
195
195
|
# guess.append([y1, x1, 1]) ##
|
|
196
196
|
|
|
@@ -250,4 +250,4 @@
|
|
|
250
250
|
|
|
251
251
|
|
|
252
252
|
|
|
253
|
-
編集(12/01 17:
|
|
253
|
+
編集(12/01 17:35) ##が変更点です
|
1
訂正
test
CHANGED
|
@@ -176,7 +176,11 @@
|
|
|
176
176
|
|
|
177
177
|
#[amp,ctr,wid]
|
|
178
178
|
|
|
179
|
+
|
|
180
|
+
|
|
179
|
-
x1, y1 = detect_peak()
|
|
181
|
+
# x1, y1 = detect_peak() ##
|
|
182
|
+
|
|
183
|
+
np_x, np_y = detect_peak()
|
|
180
184
|
|
|
181
185
|
|
|
182
186
|
|
|
@@ -184,9 +188,11 @@
|
|
|
184
188
|
|
|
185
189
|
y2=float(input("y2"))
|
|
186
190
|
|
|
187
|
-
guess = []
|
|
191
|
+
# guess = [] ##
|
|
192
|
+
|
|
188
|
-
|
|
193
|
+
guess = [[y1, x1, 1] for (x1, y1) in zip(np_x, np_y)]
|
|
194
|
+
|
|
189
|
-
guess.append([y1, x1, 1])
|
|
195
|
+
# guess.append([y1, x1, 1]) ##
|
|
190
196
|
|
|
191
197
|
guess.append([y2, x2, 1])
|
|
192
198
|
|
|
@@ -239,3 +245,9 @@
|
|
|
239
245
|
print(*popt)
|
|
240
246
|
|
|
241
247
|
```
|
|
248
|
+
|
|
249
|
+
|
|
250
|
+
|
|
251
|
+
|
|
252
|
+
|
|
253
|
+
編集(12/01 17:10) ##が変更点です
|