@@ -100,3 +100,6 ENV/ | |||||
100 | # eclipse |
|
100 | # eclipse | |
101 | .project |
|
101 | .project | |
102 | .pydevproject |
|
102 | .pydevproject | |
|
103 | ||||
|
104 | #vscode settings | |||
|
105 | schainpy/.vscode/ |
@@ -134,8 +134,58 | |||||
134 | {"year": 2024, "doy": 252, "initial_time": [5,35], "final_time": [5,35], "aux_index": [ 31, null]}, |
|
134 | {"year": 2024, "doy": 252, "initial_time": [5,35], "final_time": [5,35], "aux_index": [ 31, null]}, | |
135 | {"year": 2024, "doy": 252, "initial_time": [5,20], "final_time": [5,40], "aux_index": [ 33, null]}, |
|
135 | {"year": 2024, "doy": 252, "initial_time": [5,20], "final_time": [5,40], "aux_index": [ 33, null]}, | |
136 | {"year": 2024, "doy": 252, "initial_time": [7,5], "final_time": [7,5], "aux_index": [ 21, null]}, |
|
136 | {"year": 2024, "doy": 252, "initial_time": [7,5], "final_time": [7,5], "aux_index": [ 21, null]}, | |
137 | {"year": 2024, "doy": 252, "initial_time": [7,10], "final_time": [7,10], "aux_index": [ 23, null]} |
|
137 | {"year": 2024, "doy": 252, "initial_time": [7,10], "final_time": [7,10], "aux_index": [ 23, null]}, | |
138 |
|
138 | |||
139 |
|
139 | |||
|
140 | ||||
|
141 | {"year": 2025, "doy": 21, "initial_time": [19,45], "final_time": [19,50], "aux_index": [ null, null]}, | |||
|
142 | {"year": 2025, "doy": 22, "initial_time": [0,50], "final_time": [3,30], "aux_index": [ null, 30]}, | |||
|
143 | {"year": 2025, "doy": 22, "initial_time": [1,50], "final_time": [1,50], "aux_index": [ null, null]}, | |||
|
144 | {"year": 2025, "doy": 22, "initial_time": [2,15], "final_time": [2,25], "aux_index": [ null, 38]}, | |||
|
145 | {"year": 2025, "doy": 22, "initial_time": [2,25], "final_time": [2,35], "aux_index": [ null, null]}, | |||
|
146 | {"year": 2025, "doy": 22, "initial_time": [2,40], "final_time": [2,50], "aux_index": [ null, 40]}, | |||
|
147 | {"year": 2025, "doy": 22, "initial_time": [2,40], "final_time": [2,40], "aux_index": [ 44, null]}, | |||
|
148 | {"year": 2025, "doy": 22, "initial_time": [2,45], "final_time": [2,45], "aux_index": [ 50, null]}, | |||
|
149 | {"year": 2025, "doy": 22, "initial_time": [3,0], "final_time": [3,15], "aux_index": [ null, 33]}, | |||
|
150 | {"year": 2025, "doy": 22, "initial_time": [3,30], "final_time": [4,15], "aux_index": [ null, 28]}, | |||
|
151 | {"year": 2025, "doy": 22, "initial_time": [4,15], "final_time": [4,25], "aux_index": [ null, 24]}, | |||
|
152 | {"year": 2025, "doy": 22, "initial_time": [3,50], "final_time": [4,15], "aux_index": [ null, 15]}, | |||
|
153 | {"year": 2025, "doy": 22, "initial_time": [0,0], "final_time": [5,0], "aux_index": [ null, 13]}, | |||
|
154 | ||||
|
155 | {"year": 2025, "doy": 22, "initial_time": [5,0], "final_time": [23,55], "aux_index": [ null, 13]}, | |||
|
156 | {"year": 2025, "doy": 22, "initial_time": [14,20], "final_time": [14,20], "aux_index": [ null, null]}, | |||
|
157 | {"year": 2025, "doy": 23, "initial_time": [0,10], "final_time": [0,10], "aux_index": [ null, null]}, | |||
|
158 | {"year": 2025, "doy": 23, "initial_time": [0,55], "final_time": [3,30], "aux_index": [ null, 26]}, | |||
|
159 | {"year": 2025, "doy": 23, "initial_time": [0,0], "final_time": [5,0], "aux_index": [ null, 13]}, | |||
|
160 | {"year": 2025, "doy": 23, "initial_time": [2,25], "final_time": [2,25], "aux_index": [ null, 34]}, | |||
|
161 | {"year": 2025, "doy": 23, "initial_time": [2,10], "final_time": [2,10], "aux_index": [ 44, 48]}, | |||
|
162 | {"year": 2025, "doy": 23, "initial_time": [0,50], "final_time": [0,50], "aux_index": [ 53, 53]}, | |||
|
163 | ||||
|
164 | {"year": 2025, "doy": 23, "initial_time": [5,0], "final_time": [23,55], "aux_index": [ null, 13]}, | |||
|
165 | {"year": 2025, "doy": 23, "initial_time": [5,0], "final_time": [8,0], "aux_index": [ null, 14]}, | |||
|
166 | {"year": 2025, "doy": 23, "initial_time": [12,5], "final_time": [12,5], "aux_index": [ null, null]}, | |||
|
167 | {"year": 2025, "doy": 24, "initial_time": [1,40], "final_time": [3,15], "aux_index": [ null, null]}, | |||
|
168 | {"year": 2025, "doy": 24, "initial_time": [3,25], "final_time": [3,30], "aux_index": [ 44, null]}, | |||
|
169 | {"year": 2025, "doy": 24, "initial_time": [3,20], "final_time": [3,40], "aux_index": [ null, 31]}, | |||
|
170 | {"year": 2025, "doy": 24, "initial_time": [3,40], "final_time": [4,55], "aux_index": [ null, 29]}, | |||
|
171 | {"year": 2025, "doy": 24, "initial_time": [0,0], "final_time": [5,0], "aux_index": [ null, 13]}, | |||
|
172 | ||||
|
173 | {"year": 2025, "doy": 24, "initial_time": [5,0], "final_time": [23,55], "aux_index": [ null, 13]}, | |||
|
174 | {"year": 2025, "doy": 25, "initial_time": [0,0], "final_time": [4,55], "aux_index": [ null, 27]}, | |||
|
175 | {"year": 2025, "doy": 25, "initial_time": [2,50], "final_time": [4,55], "aux_index": [ null, 30]}, | |||
|
176 | {"year": 2025, "doy": 25, "initial_time": [0,0], "final_time": [5,0], "aux_index": [ null, 13]}, | |||
|
177 | ||||
|
178 | {"year": 2025, "doy": 25, "initial_time": [5,0], "final_time": [23,55], "aux_index": [ null, 13]}, | |||
|
179 | {"year": 2025, "doy": 26, "initial_time": [2,50], "final_time": [4,5], "aux_index": [ null, null]}, | |||
|
180 | {"year": 2025, "doy": 26, "initial_time": [2,50], "final_time": [4,5], "aux_index": [ null, null]}, | |||
|
181 | {"year": 2025, "doy": 26, "initial_time": [0,40], "final_time": [4,20], "aux_index": [ null, 24]}, | |||
|
182 | {"year": 2025, "doy": 26, "initial_time": [4,30], "final_time": [4,30], "aux_index": [ null, 20]}, | |||
|
183 | {"year": 2025, "doy": 26, "initial_time": [0,0], "final_time": [5,0], "aux_index": [ null, 13]}, | |||
|
184 | ||||
|
185 | {"year": 2025, "doy": 26, "initial_time": [5,0], "final_time": [23,55], "aux_index": [ null, 13]}, | |||
|
186 | {"year": 2025, "doy": 26, "initial_time": [0,55], "final_time": [0,55], "aux_index": [ null, null]}, | |||
|
187 | {"year": 2025, "doy": 26, "initial_time": [0,55], "final_time": [4,55], "aux_index": [ null, 24]}, | |||
|
188 | {"year": 2025, "doy": 27, "initial_time": [0,0], "final_time": [5,0], "aux_index": [ null, 13]} | |||
|
189 | ||||
140 | ]} |
|
190 | ]} | |
141 |
|
191 |
@@ -2164,7 +2164,7 class DoublePulseACFs_PerLag(Operation): | |||||
2164 | if i == 4: |
|
2164 | if i == 4: | |
2165 | exit(1) |
|
2165 | exit(1) | |
2166 | ''' |
|
2166 | ''' | |
2167 |
|
2167 | print("dataOut.alag",dataOut.alag) | ||
2168 | #print("dataOut.p",datetime.datetime.utcfromtimestamp(dataOut.utctime), dataOut.p) |
|
2168 | #print("dataOut.p",datetime.datetime.utcfromtimestamp(dataOut.utctime), dataOut.p) | |
2169 |
|
2169 | |||
2170 | #print(numpy.sum(dataOut.kabxys_integrated[8][:,:,0]+dataOut.kabxys_integrated[11][:,:,0])) |
|
2170 | #print(numpy.sum(dataOut.kabxys_integrated[8][:,:,0]+dataOut.kabxys_integrated[11][:,:,0])) | |
@@ -2480,16 +2480,39 class NormalizeDPPowerRoberto_V2(Operation): | |||||
2480 | dataOut.cflast=numpy.zeros(1,'float32') |
|
2480 | dataOut.cflast=numpy.zeros(1,'float32') | |
2481 | self.aux=0 |
|
2481 | self.aux=0 | |
2482 |
|
2482 | |||
2483 |
|
|
2483 | print(dataOut.ut_Faraday) | |
2484 |
|
2484 | |||
2485 | if (dataOut.ut_Faraday>=11.5 and dataOut.ut_Faraday<23): |
|
2485 | if (dataOut.ut_Faraday>=11.5 and dataOut.ut_Faraday<23): # 6 30am to 6pm | |
2486 | i2=(500.-dataOut.range1[0])/dataOut.DH |
|
2486 | i2=(500.-dataOut.range1[0])/dataOut.DH | |
2487 | i1=(200.-dataOut.range1[0])/dataOut.DH |
|
2487 | i1=(200.-dataOut.range1[0])/dataOut.DH | |
2488 |
|
2488 | |||
2489 |
elif(dataOut.ut_Faraday>=5 and dataOut.ut_Faraday< |
|
2489 | elif(dataOut.ut_Faraday>=5 and dataOut.ut_Faraday<8): # 0 am to 3am | |
2490 |
inda = numpy.where(dataOut.heightList >= |
|
2490 | inda = numpy.where(dataOut.heightList >= 330) # 260 #200 km | |
2491 | minIndex = inda[0][0] |
|
2491 | minIndex = inda[0][0] | |
2492 |
indb = numpy.where(dataOut.heightList < |
|
2492 | indb = numpy.where(dataOut.heightList < 470) # 350 # 700 km | |
|
2493 | maxIndex = indb[0][-1] | |||
|
2494 | print(minIndex) | |||
|
2495 | print(dataOut.heightList) | |||
|
2496 | ||||
|
2497 | ph2max_idx = numpy.nanargmax(dataOut.ph2[minIndex:maxIndex]) | |||
|
2498 | #print("dataOut.ph2[minIndex:maxIndex]: ", dataOut.ph2[minIndex:maxIndex]) | |||
|
2499 | print("dataOut.ph2: ", dataOut.ph2) | |||
|
2500 | print("dataOut.phi: ", dataOut.phi) | |||
|
2501 | print("minIndex", minIndex, "maxIndex", maxIndex) | |||
|
2502 | print(ph2max_idx) | |||
|
2503 | ||||
|
2504 | ph2max_idx += minIndex | |||
|
2505 | ||||
|
2506 | i2 = maxIndex #ph2max_idx + 6 | |||
|
2507 | i1 = minIndex #ph2max_idx - 6 | |||
|
2508 | ||||
|
2509 | print("ELSE^^^^^^^^^^^^^^^^^^^^^") | |||
|
2510 | print(dataOut.heightList[i1]) | |||
|
2511 | print(dataOut.heightList[i2]) | |||
|
2512 | elif(dataOut.ut_Faraday>=8 and dataOut.ut_Faraday<11.5): # 3 am to 6 30am ADDED | |||
|
2513 | inda = numpy.where(dataOut.heightList >= 260) # 260 #200 km | |||
|
2514 | minIndex = inda[0][0] | |||
|
2515 | indb = numpy.where(dataOut.heightList < 350) # 350 # 700 km | |||
2493 | maxIndex = indb[0][-1] |
|
2516 | maxIndex = indb[0][-1] | |
2494 | print(minIndex) |
|
2517 | print(minIndex) | |
2495 | print(dataOut.heightList) |
|
2518 | print(dataOut.heightList) | |
@@ -2499,14 +2522,7 class NormalizeDPPowerRoberto_V2(Operation): | |||||
2499 | #print("dataOut.ph2: ", dataOut.ph2) |
|
2522 | #print("dataOut.ph2: ", dataOut.ph2) | |
2500 | print("minIndex", minIndex, "maxIndex", maxIndex) |
|
2523 | print("minIndex", minIndex, "maxIndex", maxIndex) | |
2501 | print(ph2max_idx) |
|
2524 | print(ph2max_idx) | |
2502 | ''' |
|
2525 | ||
2503 | #if dataOut.flagTeTiCorrection: |
|
|||
2504 | if 1: |
|
|||
2505 | import matplotlib.pyplot as plt |
|
|||
2506 | plt.figure() |
|
|||
2507 | plt.plot(dataOut.ph2[minIndex:maxIndex],dataOut.heightList[minIndex:maxIndex],'*-') |
|
|||
2508 | plt.show() |
|
|||
2509 | ''' |
|
|||
2510 | ph2max_idx += minIndex |
|
2526 | ph2max_idx += minIndex | |
2511 |
|
2527 | |||
2512 | i2 = maxIndex #ph2max_idx + 6 |
|
2528 | i2 = maxIndex #ph2max_idx + 6 | |
@@ -2515,7 +2531,7 class NormalizeDPPowerRoberto_V2(Operation): | |||||
2515 | print("ELSE^^^^^^^^^^^^^^^^^^^^^") |
|
2531 | print("ELSE^^^^^^^^^^^^^^^^^^^^^") | |
2516 | print(dataOut.heightList[i1]) |
|
2532 | print(dataOut.heightList[i1]) | |
2517 | print(dataOut.heightList[i2]) |
|
2533 | print(dataOut.heightList[i2]) | |
2518 | else: |
|
2534 | else: #6pm to 12am | |
2519 | inda = numpy.where(dataOut.heightList >= 200) #200 km |
|
2535 | inda = numpy.where(dataOut.heightList >= 200) #200 km | |
2520 | minIndex = inda[0][0] |
|
2536 | minIndex = inda[0][0] | |
2521 | indb = numpy.where(dataOut.heightList < 700) # 700 km |
|
2537 | indb = numpy.where(dataOut.heightList < 700) # 700 km | |
@@ -2526,8 +2542,6 class NormalizeDPPowerRoberto_V2(Operation): | |||||
2526 | ph2max_idx = numpy.nanargmax(dataOut.ph2[minIndex:maxIndex]) |
|
2542 | ph2max_idx = numpy.nanargmax(dataOut.ph2[minIndex:maxIndex]) | |
2527 | #print("dataOut.ph2[minIndex:maxIndex]: ", dataOut.ph2[minIndex:maxIndex]) |
|
2543 | #print("dataOut.ph2[minIndex:maxIndex]: ", dataOut.ph2[minIndex:maxIndex]) | |
2528 | #print("dataOut.ph2: ", dataOut.ph2) |
|
2544 | #print("dataOut.ph2: ", dataOut.ph2) | |
2529 | #print("minIndex", minIndex, "maxIndex", maxIndex) |
|
|||
2530 | #print(ph2max_idx) |
|
|||
2531 | ''' |
|
2545 | ''' | |
2532 | #if dataOut.flagTeTiCorrection: |
|
2546 | #if dataOut.flagTeTiCorrection: | |
2533 | if 1: |
|
2547 | if 1: | |
@@ -2541,7 +2555,6 class NormalizeDPPowerRoberto_V2(Operation): | |||||
2541 | i2 = ph2max_idx + 6 |
|
2555 | i2 = ph2max_idx + 6 | |
2542 | i1 = ph2max_idx - 6 |
|
2556 | i1 = ph2max_idx - 6 | |
2543 |
|
2557 | |||
2544 | print("ELSE^^^^^^^^^^^^^^^^^^^^^") |
|
|||
2545 | print(dataOut.heightList[i1]) |
|
2558 | print(dataOut.heightList[i1]) | |
2546 | print(dataOut.heightList[i2]) |
|
2559 | print(dataOut.heightList[i2]) | |
2547 | ''' |
|
2560 | ''' | |
@@ -2632,7 +2645,7 class NormalizeDPPowerRoberto_V2(Operation): | |||||
2632 | dataOut.cf=self.normal(dataOut.dphi[i1::], dataOut.ph2[i1::], i2-i1, 1) |
|
2645 | dataOut.cf=self.normal(dataOut.dphi[i1::], dataOut.ph2[i1::], i2-i1, 1) | |
2633 |
|
2646 | |||
2634 | except: |
|
2647 | except: | |
2635 | print("except") |
|
2648 | print("except: chi factor not achieved in normalization") | |
2636 | dataOut.cf = numpy.nan |
|
2649 | dataOut.cf = numpy.nan | |
2637 |
|
2650 | |||
2638 | #print("cf: ",dataOut.cf) |
|
2651 | #print("cf: ",dataOut.cf) | |
@@ -3023,8 +3036,8 class DenCorrection(NormalizeDPPowerRoberto_V2): | |||||
3023 |
|
3036 | |||
3024 | from scipy import signal |
|
3037 | from scipy import signal | |
3025 |
|
3038 | |||
3026 | def func(params): |
|
3039 | #def func(params): | |
3027 | return (ratio2-self.gaussian(dataOut.heightList[:dataOut.NSHTS],params[0],params[1],params[2])) |
|
3040 | # return (ratio2-self.gaussian(dataOut.heightList[:dataOut.NSHTS],params[0],params[1],params[2])) | |
3028 |
|
3041 | |||
3029 | #print("Before loop") |
|
3042 | #print("Before loop") | |
3030 | dataOut.info2[0] = 1 |
|
3043 | dataOut.info2[0] = 1 |
@@ -441,7 +441,40 | |||||
441 |
|
441 | |||
442 | {"year": 2024,"doy": 252, |
|
442 | {"year": 2024,"doy": 252, | |
443 | "time": [[7,5]], |
|
443 | "time": [[7,5]], | |
444 | "cf": "dataOut.cflast[0]"} |
|
444 | "cf": "dataOut.cflast[0]"}, | |
|
445 | ||||
|
446 | ||||
|
447 | {"year": 2025,"doy": 21, | |||
|
448 | "time": [[15,20]], | |||
|
449 | "cf": 0.0019}, | |||
|
450 | {"year": 2025,"doy": 22, | |||
|
451 | "time": [[2,30],[2,35],[2,40],[2,45],[2,50],[2,55],[3,5],[3,55]], | |||
|
452 | "cf": "dataOut.cflast[0]"}, | |||
|
453 | {"year": 2025,"doy": 22, | |||
|
454 | "time": [[3,0]], | |||
|
455 | "cf": 0.0019}, | |||
|
456 | ||||
|
457 | {"year": 2025,"doy": 22, | |||
|
458 | "time": [[5,15],[5,35],[5,45],[5,50],[5,55]], | |||
|
459 | "cf": "dataOut.cflast[0]"}, | |||
|
460 | {"year": 2025,"doy": 23, | |||
|
461 | "time": [[2,5],[2,25]], | |||
|
462 | "cf": "dataOut.cflast[0]"}, | |||
445 |
|
463 | |||
|
464 | {"year": 2025,"doy": 23, | |||
|
465 | "time": [[5,5],[5,30],[5,50]], | |||
|
466 | "cf": "dataOut.cflast[0]"}, | |||
|
467 | {"year": 2025,"doy": 24, | |||
|
468 | "time": [[4,0]], | |||
|
469 | "cf": "dataOut.cflast[0]"}, | |||
|
470 | ||||
|
471 | {"year": 2025,"doy": 25, | |||
|
472 | "time": [[3,5],[3,30]], | |||
|
473 | "cf": "dataOut.cflast[0]"}, | |||
|
474 | ||||
|
475 | {"year": 2025,"doy": 26, | |||
|
476 | "time": [[4,15],[4,20]], | |||
|
477 | "cf": "dataOut.cflast[0]"} | |||
|
478 | ||||
446 |
|
479 | |||
447 | ]} |
|
480 | ]} |
General Comments 0
You need to be logged in to leave comments.
Login now