Adding more excluded intervals

Author: jzuhone

kadi/commands/validate.py

@@ -779,10 +779,15 @@ def state_vals(self):
 
     def add_exclude_intervals(self):
         super().add_exclude_intervals()
-        # The following corresponds to an ACIS watchdog reboot
+        self.add_exclude_interval(
+            "2020:023:17:57:00", "2020:023:23:07:30", "ACIS FSW v56 Update"
+        )
         self.add_exclude_interval(
             "2022:016:00:05:23", "2022:018:18:43:48", "ACIS Watchdog Reboot"
         )
+        self.add_exclude_interval(
+            "2023:263:00:37:00", "2023:263:07:40:00", "ACIS FSW v60 Update"
+        )
 
 
 def get_overlap_mask(times: np.ndarray, intervals: Table):

kadi/scripts/create_dpa_power_model.py

@@ -18,7 +18,9 @@
 logger = logging.getLogger("kadi")
 
 exclude_intervals = [
-    ("2022:016:00:05:23", "2022:018:18:43:48"),
+    ("2020:023:17:57:00", "2020:023:23:07:30"),  # ACIS FSW v56 Update
+    ("2022:016:00:05:23", "2022:018:18:43:48"),  # ACIS Watchdog Reboot
+    ("2023:263:00:37:00", "2023:263:07:40:00"),  # ACIS FSW v60 Update
 ]
 
 
@@ -54,8 +56,6 @@ def main():
     stop = CxoTime(args.stop)
     start = stop - args.days * u.day
 
-    logger.debug("Obtaining data from %s to %s", start.yday, stop.yday)
-
     # States to obtain for the model
     state_keys = [
         "ccd_count",
@@ -81,6 +81,8 @@ def main():
 
     logger.setLevel(args.log_level)
 
+    logger.info("Using data from %s to %s", start.yday, stop.yday)
+
     # create on-off states for FEPs and CCDs
     ccds = [f"I{i}" for i in range(4)] + [f"S{i}" for i in range(6)]
     ccdsfeps = defaultdict(list)