Skip to content

Commit 3fded78

Browse files
Gregg140Gregg140
authored
Merge pull request #30 from acisops/GIT_VO
Handles user request that full continuity loads (science+vehicle comm…
2 parents c8343ac + 3f35e3f commit 3fded78

File tree

4 files changed

+333
-66
lines changed

4 files changed

+333
-66
lines changed

‎Release_Notes_V4.0.txt‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
Change Description
2+
==================
3+
4+
The main drivers for this update are:
5+
6+
1) Continuity load having the same load week name as the review load (e.g. SEP2121B SEP2021A)
7+
8+
Prior to this update, the user did not specify the load letter for the continuity load in the lr
9+
command line. This prevented the prior load of the same load week as the review load from
10+
being specified as the continuity load.
11+
12+
2) A full weekly load being built with both science and vehicle commands, the load is uplinked,
13+
but only the vehicle commands executed (e.g. JAN1722).
14+
15+
The thermal models need to know that when assembling a load history, only the vehicle commands
16+
should be included when reading ther continuity load. The ACIS Ops Load Review software (lr) was
17+
modified to give the user the ability to specify that, when reading continuity loads, the thermal models
18+
should read the vehicle-only VR*.backstop file. The default is to read the CR*.backstop file.
19+
20+
This is accomplished by adding a --VO VOC switch to the lr command line. If not used the default read of
21+
CR*.backstop will be executed. If the switch is specified, it is first checked for legal values. If the value of
22+
VOC is supplied to the switch then the thermal models will read the VR*.backstop file. This is accomplished
23+
by appending "VO_" to the load type discerned by lr (Normal, TOO, SCS-107, FULL STOP).
24+
This load type is written out to the ACIS-Continuity.txt file, which is read by backstop history.
25+
26+
This update must be done in concert with the update to Backstop_History as
27+
Backstop_History has been modified to recognize the VO_ prefix and knows how to handle it.
28+
29+
Additional updates were made to lr:
30+
31+
3) Fix the bug which incorrectly threw and error when checking for the "triplet" - a set of 3
32+
commands expected after the conclusion of the Perigee Passage inbound ECS measurement.
33+
Initially, lr expected the power command within the triplet to be WSVIDALLDN. Over time
34+
the triplet could contain WSPOW00000 and WSPOW0002A.
35+
36+
4) A --nomodels option to lr and run_models.pl which tells lr to not run the thermal models
37+
This can be used to speed up lr regression tests when the modification does not affect the
38+
thermal models.
39+
40+
5) Clarified the user prompts which, when the -break switch is used, determine what the
41+
load type is (TOO, SCS-107, STOP).
42+
43+
6) Added comments and fixed typos
44+
45+
46+
47+
48+
49+
50+
Files Changed or added:
51+
===================
52+
53+
lr, acis-backstop.pl, Release_Notes_V4.0.txt
54+
55+
The changes can be seen here:
56+
57+
https://github.com/acisops/lr/pull/30
58+
59+
This update must be done in concert with the change in backstop_history:
60+
61+
https://github.com/acisops/backstop_history/pull/22
62+
63+
64+
Testing:
65+
========
66+
67+
The changes were tested by running the:
68+
69+
JUL0821A
70+
SEP2021B
71+
OCT1821A
72+
OCT2521B
73+
OCT2821A
74+
OCT3021A
75+
JAN1822B
76+
JAN2422A
77+
78+
loads in test mode. Behavior checked both if a new switch was, and was not used (e.g. --nomodels and
79+
--VO VOC). Also tested when a continuity load had a letter attached to it and when it did not both in cases
80+
where it was required (SEP2021B) and where it was not required. If not required output was the same
81+
as in production.
82+
83+
All changes which affected thermal model output were tested with and without new switches for
84+
all 4 load types (Normal, TOO, SCS-107, Full Stop).
85+
86+
Thermal models were run where the changes affect the ouput of the models such as SEP2021B and OCT18-3021
87+
Assembled history was correct.
88+
89+
The output in the test directories was compared to that in the production directories. All differences were
90+
expected and understood.
91+
92+
93+
Interface impacts
94+
=================
95+
96+
ACIS Ops lr user has new switches to use when appropriate.
97+
98+
99+
Review
100+
======
101+
102+
ACIS Ops
103+
104+
105+
Deployment Plan
106+
===============
107+
108+
109+

‎acis-backstop.pl‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@
5252
# - Modified code to print out a row of "-cti"'s when a Perigee Passage
5353
# CTI measurement is completed.
5454
# - Added numerous comments
55+
#
56+
# Update: January 6, 2022
57+
# Gregg Germain
58+
# V3.3
59+
# - Modified the "triplet" code to include WSPOW00000 as a legal
60+
# triplet power command. Also combined the 2 individual sections
61+
# of triplet power command test code into one which now includes the WSPOW0.
5562
#--------------------------------------------------------------------
5663
use DBI;
5764
use Text::ParseWords;
@@ -1871,14 +1878,6 @@ sub process_acispkt{
18711878
#----------------------------------------
18721879
# Video all down
18731880
#----------------------------------------
1874-
if ($Rec_Eventdata{TLMSID} eq "WSVIDALLDN") {
1875-
$viddwn_cnt=$viddwn_cnt+1;
1876-
$per_vidalldn=$dec_day;
1877-
# WSVIDALLDN was used in the triplet prior to January 2018.
1878-
if($triplet_check == 1){
1879-
$triplet_check = 2;
1880-
}
1881-
}
18821881

18831882
#----------------------------------------
18841883
# New power command which leaves three
@@ -1893,15 +1892,20 @@ sub process_acispkt{
18931892
# The above triplet treatment for WSVIDALLDN
18941893
# is left in there for old loads to still work
18951894
#----------------------------------------
1896-
if ($Rec_Eventdata{TLMSID} eq "WSPOW0002A") {
1897-
$viddwn_cnt=$viddwn_cnt+1;
1898-
$per_vidalldn=$dec_day;
1899-
# WSVIDALLDN was used in the triplet prior to January 2018.
1900-
if($triplet_check == 1){
1901-
$triplet_check = 2;
1902-
}
1903-
}
19041895

1896+
# Code which captures a WSPOW00000, WSPOW0002A, and WSVIDALLDN
1897+
# capture check for the post-outbound perigee passage ECS triplet power command.
1898+
if (($Rec_Eventdata{TLMSID} eq "WSPOW00000") ||
1899+
($Rec_Eventdata{TLMSID} eq "WSPOW0002A") ||
1900+
($Rec_Eventdata{TLMSID} eq "WSVIDALLDN"))
1901+
{
1902+
$viddwn_cnt=$viddwn_cnt+1;
1903+
$per_vidalldn=$dec_day;
1904+
# Increment the value of triplet_check indicating you have obtained
1905+
# the first two items of the triplet
1906+
if($triplet_check == 1)
1907+
{ $triplet_check = 2; }
1908+
}
19051909

19061910

19071911
#----------------------------------------

0 commit comments

Comments
 (0)