Skip to content

Commit 86a9a48

Browse files
authored
Merge pull request #45 from acisops/Collection_of_LR_Updates
LR updates: run_models.py, OBSID timing error fix
2 parents 7bcc5de + fed04c1 commit 86a9a48

File tree

6 files changed

+498
-89
lines changed

6 files changed

+498
-89
lines changed

Adjust_ACIS-Continuity.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
The ACIS-Continuity.txt file adjustment will be SCS-107 for S107
2323
or STOP for Full Stops.
2424
25+
The NLET file is not modified. It is only used only to determine the type of load
26+
interruption.
27+
2528
The graphical timeline representation of events:
2629
2730
| Continuity-Continuity Load|
@@ -30,7 +33,13 @@
3033
3134
| Continuity load built, Reviewed and Approved prior to the interrupt |
3235
33-
| Review Load |
36+
37+
| Review Load |
38+
39+
Update: July 23, 2025
40+
Gregg Germain
41+
Comment updates
42+
3443
"""
3544
# Create a parser instance
3645
myparser = argparse.ArgumentParser()

CHECK_POWER_COMMANDS/Check_Power_Cmds.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
################################################################################
22
#
33
# Check_Power_Cmds - Check the power command spacing in the load to see if the
4-
# rules ahve been adhered to. Any errors are inserted into a
4+
# rules have been adhered to. Any errors are inserted into a
55
# new ACIS-LoadReviews.dat file.
66
#
77
# For the time being, this new file is kept separate from
@@ -25,13 +25,12 @@
2525
# - Removed deprecated Chandra.Time
2626
# - Eliminated commented-out line
2727
#
28-
# Update: February 15, 2022
28+
# Update: July 23, 2025
2929
# Gregg Germain
3030
# - Allow for the case of a Vehicle-Only Review load where there are no ACISPKT commands
3131
#
3232
################################################################################
3333
import argparse
34-
3534
import glob
3635

3736
# bring in the system state class
@@ -162,7 +161,7 @@ def run_one_command(cmd, system_state, bfc, rule_set):
162161
If it did not, then stop.
163162
"""
164163
# Using ARGPARSE
165-
cl_parser = argparse.ArgumentParser(description='WeeklyPDAMS plots')
164+
cl_parser = argparse.ArgumentParser(description='Check Power Commands program')
166165

167166
# Add the TEST argument as NON-POSITIONAL.
168167
cl_parser.add_argument("-t", '--test', help='In test mode, plots are not moved to htdocs', action="store_true")
@@ -207,7 +206,7 @@ def run_one_command(cmd, system_state, bfc, rule_set):
207206

208207

209208
# If this is a Vehicle-Only Review load then there will be no ACISPKT commands within the load.
210-
# So skip the while loop which is intended ot take you to the first one.
209+
# So skip the while loop which is intended to take you to the first one.
211210
# This means that array_row_number will equal 0
212211

213212
if 'ACISPKT' in system_packets['cmd_type']:
@@ -298,7 +297,7 @@ def run_one_command(cmd, system_state, bfc, rule_set):
298297

299298
# Append any violations you found to the master violations list
300299
if violations_list:
301-
all_violations+= violations_list[0]
300+
all_violations += violations_list[0]
302301

303302

304303
if len(all_violations) == 0:

Release_Notes_V5.0.txt

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
Change Description
2+
==================
3+
4+
lr is the ACIS Operations review load processing program. Updates were made to lr and to several of the
5+
other programs lr executes.
6+
7+
lr, itself, was modified to fix an IF statement that incorrectly analyzed if a load was of the type TOO and the
8+
continuity load is Vehicle Only. lr was also modified to call the new run_models.py which replaces run_models.pl
9+
10+
The following updated programs are excuted by lr:
11+
12+
run_models.py was written to continue the conversion of load review programs from Perl to Python. run_models.py included
13+
a new switch allowing for easier unit testing on existing Production loads. No interface changes.
14+
15+
acisbackstop.pl was modified to eliminate false errors generated when calculating the time delta
16+
between an observation's Stop Science command and the next command to change the Obsid.
17+
18+
Check_Power_Cmds.py was modified to be more efficient by avoiding the ACISPKT processing loop when processing a
19+
Vehicle Only load.
20+
21+
Other updates includes fixing typos and making comments more clear.
22+
23+
24+
25+
26+
27+
28+
Files Changed or added:
29+
=======================
30+
31+
32+
The updates can be seen here:
33+
34+
https://github.com/acisops/lr/pull/45
35+
36+
37+
Testing:
38+
========
39+
40+
Unit tests were carried out by running test scenarios on all the updated programs except lr.
41+
42+
Then full regression tests were carried out by arranging for the updated lr to call the new
43+
programs on Normal, TOO, SCS-107-only and Full Stop loads and loads with and without Vehicle Only Continuity loads. ACIS-LoadReview.txt output files and
44+
thermal model plots were compared and all differences were understood.
45+
46+
47+
The production loads involved were:
48+
49+
JUL1425A
50+
APR2825A
51+
MAY0525A
52+
MAR2625A
53+
MAR2725A
54+
JAN1525A
55+
56+
JAN2624A
57+
OCT1324A & B
58+
59+
All tests passed.
60+
61+
62+
63+
Interface impacts
64+
=================
65+
66+
None
67+
68+
69+
Review
70+
======
71+
72+
ACIS Ops
73+
74+
75+
Deployment Plan
76+
===============
77+
78+
Will be deployed after FSDS approval.
79+

0 commit comments

Comments
 (0)