Merge pull request #31 from acisops/VOR-VOB

Review load is a full science + vehicle load but only vehicle commands executed.

Author: Gregg140

CHECK_POWER_COMMANDS/Backstop_File_Class.py

@@ -262,13 +262,13 @@ def insert_errors(self, lr_file, violations_list):
         # ACIS-LoadReview.txt.ERRORS files intact for comparison.
         if not self.test_flag:
             try:
-                print('Moving ACIS-LoadReview.txt.ERRORS to ACIS-LoadReview.txt')
+                print('      Moving ACIS-LoadReview.txt.ERRORS to ACIS-LoadReview.txt')
                 shutil.move('ACIS-LoadReview.txt.ERRORS', 'ACIS-LoadReview.txt')
             except OSError as err:
                 print(err)
                 print('Examine the ofls directory and look for the .ERRORS file.')
             else:
-                print('Copy was successful')
+                print('      Copy of errors into ACIS-LoadReview.txt was successful')
         else:
             print('\nTEST MODE - Leaving the ACIS-LoadReview.txt and ACIS-LoadReview.txt.ERRORS files intact for comparison')
 

CHECK_POWER_COMMANDS/Check_Power_Cmds.py

@@ -24,6 +24,11 @@
 #         - Part of the Feb 22 update to fix the 63 second erroneous violations
 #         - Removed deprecated Chandra.Time
 #         - Eliminated commented-out line
+#
+# Update: February 15, 2022
+#          Gregg Germain
+#          - Allow for the case of a Vehicle-Only Review load where there are no ACISPKT commands
+#
 ################################################################################
 import argparse
 
@@ -168,10 +173,9 @@ def run_one_command(cmd, system_state, bfc, rule_set):
 # Set the test flag based upon user input
 if testargs.test:
     # For Test Purposes:
-    print('\nCheck_Power_Cmds -  RUNNING IN TEST MODE\n')
+    print('\n    Check_Power_Cmds -  RUNNING IN TEST MODE')
     test_flag = True
 else:
-    print("\nRunning for score.\n")
     test_flag = False
 
 # Now create an instance of the the System State Class.
@@ -201,32 +205,40 @@ def run_one_command(cmd, system_state, bfc, rule_set):
 # Grab the first item in the array
 present_cmd = system_packets[array_row_number]
 
-# Now  process each entry until you hit your
-# first ACISPKT.  Then you process that first one.  This will set up
-# the system state for processing the next ACISPKT that you encounter
-while present_cmd['cmd_type'] != 'ACISPKT':
 
-    # Run the ORB rules on the present state
-    system_state, new_rules_fired, violations_list = run_one_command(present_cmd,
-                                                                     system_state,
-                                                                     bfc,
-                                                                     Rulesets.ORB_CMD_SW_rule_set)
+# If this is a Vehicle-Only Review load then there will be no ACISPKT commands within the load.
+# So skip the while loop which is intended ot take you to the first one.  
+# This means that array_row_number will equal 0
+
+if 'ACISPKT' in system_packets['cmd_type']:
+
+    # 
+    # Now  process each entry until you hit your first ACISPKT.  
+    # Then you process that first one.  This will set up
+    # the system state for processing the next ACISPKT that you encounter
+    while present_cmd['cmd_type'] != 'ACISPKT':
+
+        # Run the ORB rules on the present state
+        system_state, new_rules_fired, violations_list = run_one_command(present_cmd,
+                                                                             system_state,
+                                                                             bfc,
+                                                                             Rulesets.ORB_CMD_SW_rule_set)
 
-    # Append all the rules that may have fired to the master rule list
-    if new_rules_fired:
-        all_rules_fired.append(list(new_rules_fired))
+        # Append all the rules that may have fired to the master rule list
+        if new_rules_fired:
+            all_rules_fired.append(list(new_rules_fired))
 
-    # Append any violations you found to the master violations list
-    if violations_list:
-        all_violations.append(violations_list[0])
+        # Append any violations you found to the master violations list
+        if violations_list:
+            all_violations.append(violations_list[0])
 
-    # You want to increment the system_packets index so that you can look
-    # at the next command.
-    # You will be looking at the next row
-    array_row_number += 1
+        # You want to increment the system_packets index so that you can look
+        # at the next command.
+        # You will be looking at the next row
+        array_row_number += 1
 
-    # Now look at the next command in the backstop file.
-    present_cmd = system_packets[array_row_number]
+        # Now look at the next command in the backstop file.
+        present_cmd = system_packets[array_row_number]
 
 
 # Ok so this next command you are looking at is an ACISPKT command.
@@ -286,7 +298,16 @@ def run_one_command(cmd, system_state, bfc, rule_set):
 
     # Append any violations you found to the master violations list
     if violations_list:
-        all_violations += violations_list[0]
+        all_violations+= violations_list[0]
+
+
+if len(all_violations) == 0:
+    print('\n    NO POWER COMMAND ERRORS FOUND\n')
+else:
+    # Write out the errors
+    print('\n    ERROR - POWER COMMAND ERRORS FOUND!')
+    bfc.insert_errors('ACIS-LoadReview.txt', all_violations)
+
+
+
 
-# Write out the error
-bfc.insert_errors('ACIS-LoadReview.txt', all_violations)

Release_Notes_V4.1.txt

@@ -0,0 +1,74 @@
+Change Description
+==================
+
+The main driver for this update is handling the circumstance where the Review load is a full science + vehicle
+commands load, but we know - prior to the review - that only the vehicle load command set, in the
+review load, will be executed. The new LR switch: VOR for Vehicle Only Review was implemented. The Focal plane
+thermal model had difficulties with the -109 database searches when the Vehicle-Only portion of a full load was 
+processed by lr (see FSDS-18).
+
+The program which checks for power command timing errors had to be modified to handle loads without any ACISPKT commands.
+Also the Check_Power_Cmds output messages were cleaned up and made more informative.
+
+
+
+Files Changed or added:
+=================== 
+
+lr, Release_Notes_V4.1.txt
+
+The changes can be seen here:
+
+https://github.com/acisops/lr/pull/31
+
+Must be installed with or after an acis_thermal_check update:
+
+FSDS-18 - https://github.com/acisops/acis_thermal_check/pull/48
+
+
+
+Testing:
+======== 
+
+The changes were tested by running these regression test loads:
+
+DEC2418A
+DEC2418B
+MAY2620
+AUG3120
+SEP2021
+OCT2821
+OCT3021
+JAN1022 
+FEB1422
+
+These test types included Normal, TOO, SCS-107 and Full Stop loads; loads with and without power commanding errors,
+loads which were vehicle-only as built (e.g. MAY2620 and AUG3120), and loads which were built as full loads but 
+only the vehicle commands were activated (e.g. OCT2821 and FEB1422), and loads which were not affected by 
+Vehicle-Only Continuity or Review loads. In cases where there was no production case of a load type being executed as
+a full Review load (science+vehicle) where the Vehicle-Only commands were executed, tests were run and checked by hand
+(e.g. JAN1022). 
+
+The assembled histories for OCT2821 and FEB1422 were checked by hand and these loads were added to the regression test suite. 
+Tests were also conducted using acis_thermal_checl/pull/48 to assure that the problem was fixed and the results were correct.
+Where applicable, thermal model output was checked. All differing results were accounted for: all tests passed.
+
+
+
+Interface impacts
+=================
+
+ACIS Ops lr user has a new switch to use when appropriate VOR.
+
+
+Review
+====== 
+
+ACIS Ops
+
+
+Deployment Plan
+===============
+
+
+

lr

@@ -125,7 +125,7 @@ use Plucknames;
 #
 #
 # Update: September, 21, 2021
-#         V3.9
+#          V3.9
 #         - Move CHECK_POWER_COMMANDS and WINDOW_CHECK to before
 #           run_models call
 #
@@ -142,6 +142,10 @@ use Plucknames;
 #         - added --nomodels switch to run LR without running the thermal models
 #         - Added comments and fixed typos
 #
+# Update: February 10, 2022
+#          V4.1
+#          - Activated hooks for VOB and VOR switches
+#
 ###########################################################
 # usage: lr [present load] [previous week]                #
 #         example:  lr AUG2701A AUG2001                   #
@@ -191,9 +195,12 @@ if ($VO_choice  ne "")
     # But since they did supply one, check to see if the supplied argument 
     # is in the list. We want to check this and, if the input is invalid, exit.
     if(  not( grep( /^$VO_choice$/,  @VO_types)))
-    {
-     die("FATAL ERROR - $VO_choice is an invalid value for the VO switch.\nValid values are: VOC, VOR, VOB\n");
-    }
+      {
+       die("FATAL ERROR - $VO_choice is an invalid value for the VO switch.\nValid values are: VOC, VOR, VOB\n");
+      }
+    else
+      { print "\n The VO value is: $VO_choice";}
+
   }
 
 
@@ -298,7 +305,7 @@ print("\nLength of the input string is: $len_prevload");
 # Get the last token in the preview load name
 $last_token = substr($prev_load, -1);
 
-print("\nBefore the IF:");
+
 print("\n    The Previous load variable contains:  $prev_load");
 
 
@@ -422,7 +429,7 @@ if( (! $test_dir) &&
 #------------------------------------------------------
 
 # CD to the newly-created ofls<x> directory.
-# CD to /data/acis/LoadReviews/<YEAR>/LOAD/ofls<a,b,c etc> -------  IN OFLS DIR
+# CD to /data/acis/LoadReviews/<YEAR>/LOAD/ofls<a,b,c etc>                 --------------------------------  IN OFLS DIR
 chdir("${ofls_dir}") || die "Cannot change directories to $ofls_dir\n";
 
 if ($skiplucky)
@@ -483,7 +490,8 @@ print "unzipping: $zip ...\n";
 # Get tar file
 $file = (Plucknames->findNames(".", "backstop.tar"))[0];
 
-#backstop extraction and acis script
+# Extract both the CR*.backstop file and the .../vehicle/VR*.backstop file
+# backstop extraction and acis script
 @tarTOC = Archive::Tar->list_archive($file, 0);
 @bck = Plucknames->tarNames(\@tarTOC, "backstop"); 
 
@@ -652,19 +660,56 @@ open(CONTFILE, ">$ofls_dir/ACIS-Continuity.txt");
 # directory path to the ACIS-Continuity.txt file
 print CONTFILE $prev_load_dir.$ofls_val, "\n";
 
-# Now, if the user specified "VOC" for the VO command line argument,
-# Then append "VO_" to the load type.  This will inform the models
+# Now, if the user specified either "VOC" or "VOB"for the VO command line argument,
+# then append "VO_" to the load type.  This will inform the models
 # that when the continuity load is read, the Vehicle Only version
 # should be used.  Otherwise load_type should be just the present
 # value
-if  ($VO_choice eq "VOC")
+#
+# VOB stands for (V)ehicle (O)nly (B)oth, meaning that the VR*.backstop vehicle only file
+# should be read for both the Review and the Continuity load.  But this piece of code
+# handles what gets written to the ACIS-Continuity.txt file. So in both cases (VOC and VOB)
+# You want ACIS-Continuity.txt to indicate vehicle-only for the Continuity load.
+# Reading the VR*.backstop file for the review load is handled by the call to run-models.pl.
+if  ( ($VO_choice eq "VOC") || ($VO_choice eq "VOB") )
   {
     # User selected VOC for the VO switch. Tell the model to read
     # the vehicle only load for the Continuity. Append "VO_"
     # to the recognized load type
     $load_type = "VO_".$load_type;
   }
 
+# Now if $VO_choice is either VOB or VOR, then the REVIEW Load is to be run Vehicle Only.
+# In this case copy the CR*.backstop file to ORIG_CR*.backstop, and the .../vehicle/VR*.backstop
+# is to be copied to CR*_V.backstop.
+# 
+if  ( ($VO_choice eq "VOR") || ($VO_choice eq "VOB") )
+  {
+
+    # Save the full backstop file as ORIG_CR*.backstop
+    print "\nReceived the $VO_choice switch. Copying $backfile to ORIG_${backfile}";
+    system("mv $backfile ORIG_${backfile}");
+
+    # Formulate the modified name for the CR backstop file to include "_V" in the name
+    # Index of the beginning of the extension: ".backstop"
+    $ext_index = index($backfile, ".backstop");
+
+    # Extract the file name without the extension
+    $old_CR_file_name = substr($backfile, 0, $ext_index);
+
+    # Compose a new name by concatenating the "_V" to the name and include the extension
+    $new_CR_file_name = "${old_CR_file_name}_V.backstop";
+
+    # Perform the copy of the Vehicle-Only file to tne CR file with the new name.
+    print "\n    ...and now copying $vfile to $new_CR_file_name";
+    system( "cp $vfile $new_CR_file_name");
+
+
+    # Lastly, change the variable $backfile so that it points to the new CR*_V.backstop file
+    # Other applications need to access this file and they need to know the new name
+    $backfile  = $new_CR_file_name;
+  }
+
 
 # Write out the type of load: Normal, TOO, SCS107  
 if ($break == 1)
@@ -761,7 +806,7 @@ print "\nACIS-backstop completed.\n";
 #------------------------------
 # Set up soft links
 #------------------------------
-chdir("$cur_load_dir") || die "cannot change to ${cur_load_dir}\n";
+chdir("$cur_load_dir") || die "cannot change to ${cur_load_dir}\n";   #  -------------------------------- CHDIR IN .../YYYY/MMMDDYY DIR
 
 if(-e "./ofls")
   {
@@ -772,7 +817,7 @@ if(-e "./ofls")
 symlink( "${ofls_dir}", "./ofls");
 
 # CD to the OFLS dir
-chdir("${ofls_dir}") || die "Cannot change to {$ofls_dir}";
+chdir("${ofls_dir}") || die "Cannot change to {$ofls_dir}";             #  -------------------------------- CHDIR IN OFLS DIR
 
 
 #determine and display version of ACIS tables used:
@@ -859,8 +904,10 @@ else
 #
 # Run Check_Power_Cmds.py
 print "\nEXECUTING THE CHECK POWER COMMAND PROGRAM";
+# PRODUCTION
 system("/usr/local/bin/python3 /data/acis/LoadReviews/script/CHECK_POWER_COMMANDS/Check_Power_Cmds.py");
 
+
 # Now execute the Window Check program
 print "\nEXECUTING THE WINDOW CHECK PROGRAM.";
 system('/usr/local/bin/python3 /data/acis/LoadReviews/script/WINDOW_CHECK/Window_Check.py');
@@ -940,7 +987,7 @@ print "Done with thermal codes...\n\n";
 print "\nACIS TABLES USED IN THIS LOAD:\n$cfg_file\n$dat_file\n";
 
 # CD to /data/acis<-bak>/LoadReviews.
-chdir("$lr_dir");
+chdir("$lr_dir");                                 #  -------------------------------- CHDIR IN /DATA/ACIS/LoadReviews DIR
 
 # Do NOT use this directory for ACE if there is test directory
 unless($test_dir){