Compare View
Commits (6)
Showing
2 changed files
Show diff stats
config/pyros_observatory/general/devices/device_FLI_KITS_generic.yml
... | ... | @@ -5,17 +5,17 @@ schema: schema_device-2.0.yml |
5 | 5 | DEVICE: |
6 | 6 | |
7 | 7 | inventory_label: Undefined |
8 | - manufacturer: FLI | |
9 | - model: Kepler Image Time Stamp | |
10 | - description: "GPS FLI Kepler" # opt str | |
8 | + manufacturer: GARMIN | |
9 | + model: Kepler Image Time Stamp (FITS) | |
10 | + description: "GPS 19x HVSM/N M1A1GN00" # opt str | |
11 | 11 | sn: Undefined |
12 | 12 | power: |
13 | - voltage: 12 | |
14 | - intensity: 1 | |
13 | + voltage: 7.33 | |
14 | + intensity: 0.1 | |
15 | 15 | socket: "MiniDIN 8 pins" |
16 | 16 | |
17 | 17 | connector: |
18 | - input: "GPS radio waves" | |
18 | + input: "GLONASS radio waves" | |
19 | 19 | output: "Meta data" |
20 | 20 | |
21 | 21 | comm: | ... | ... |
src/core/pyros_django/scheduling/A_Scheduler.py
... | ... | @@ -236,6 +236,10 @@ class A_Scheduler(Agent): |
236 | 236 | """ |
237 | 237 | t0 = time.time() |
238 | 238 | self.DPRINT = True |
239 | + | |
240 | + # =================== | |
241 | + # --- Initializations | |
242 | + # =================== | |
239 | 243 | # --- Get the incoming directory of the night |
240 | 244 | info = self.get_infos() |
241 | 245 | rootdir = info['rootdir'] |
... | ... | @@ -263,7 +267,10 @@ class A_Scheduler(Agent): |
263 | 267 | schedule_order = np.zeros(self.BINS_NIGHT, dtype=int) -1 |
264 | 268 | schedule_jd = np.zeros(self.BINS_NIGHT, dtype=float) |
265 | 269 | schedule_scientific_programm_id = np.zeros(self.BINS_NIGHT, dtype=int) -1 |
270 | + | |
271 | + # =========================================================================================================== | |
266 | 272 | # --- Initialize the predictive schedule by the effective schedule from start of the current instant (=index) |
273 | + # =========================================================================================================== | |
267 | 274 | try: |
268 | 275 | last_schedule = EffectiveSchedule.objects.last() |
269 | 276 | except EffectiveSchedule.DoesNotExist: |
... | ... | @@ -285,7 +292,7 @@ class A_Scheduler(Agent): |
285 | 292 | schedule_jd[0:index] = schedule_eff_jd[0:index] |
286 | 293 | schedule_scientific_programm_id[0:index] = schedule_eff_scientific_programm_id[0:index] |
287 | 294 | else: |
288 | - # --- Case when there is not ever effective schedule for this night | |
295 | + # --- Case when there is no effective schedule for this night | |
289 | 296 | print(f"No effective schedule for this night {night}") |
290 | 297 | else: |
291 | 298 | # --- Case of invalid entry in the database |
... | ... | @@ -314,9 +321,9 @@ class A_Scheduler(Agent): |
314 | 321 | if os.path.exists(ephfile): |
315 | 322 | self.dprint(f"Read file {seqfile}") |
316 | 323 | # --- seq_info = sequence dictionary |
317 | - # --- eph_info = ephemeris dictionary | |
318 | 324 | seq_info = pickle.load(open(seqfile,"rb")) |
319 | 325 | #print("="*20 + "\n" + f"{seq_info=}") |
326 | + # --- eph_info = ephemeris dictionary | |
320 | 327 | eph_info = pickle.load(open(ephfile,"rb")) |
321 | 328 | #print("="*20 + "\n" + f"{eph_info=}") |
322 | 329 | # --- | ... | ... |