Update to use scenario=flight in make_timeline.py

arc3.cfg

@@ -78,10 +78,8 @@ query_name = eclipse
   soho_solar_wind   = https://space.umd.edu/pm
   ace_solar_wind   = http://services.swpc.noaa.gov/images/ace-mag-swepam-3-day.gif
   solar_flare_monitor = https://www.solen.info/solar/index.html
-  mta_ace_img  = https://cxc.harvard.edu/mta/mta_ace_plot.gif
-  mta_goes_img = https://cxc.harvard.edu/mta/RADIATION/pgplot.gif
-  mta_ace      = https://cxc.harvard.edu/mta/ace.html
-  mta_goes     = https://cxc.cfa.harvard.edu/mta/RADIATION_new/GOES/goes_pchan_p.html
+  mta_ace      = https://cxc.cfa.harvard.edu/mta/RADIATION/ACE/ace.html
+  mta_goes     = https://cxc.cfa.harvard.edu/mta/RADIATION/GOES/goes_pchan_p.html
   mta_snapshot = https://cxc.harvard.edu/cgi-gen/mta/Snap/snap.cgi
   mta_soh      = https://cxc.harvard.edu/cgi-gen/mta/SOH/soh.html
   swpc_ace_rtsw = http://www.swpc.noaa.gov/products/ace-real-time-solar-wind

make_timeline.py

@@ -245,7 +245,9 @@ def arc_data_file(
 acis_fluence_file = functools.partial(
     arc_data_file, "/proj/web-cxc/htdocs/acis/Fluence", "current.dat"
 )
-ace_rates_file = functools.partial(arc_data_file, "/data/mta4/www", "ace.html")
+ace_rates_file = functools.partial(
+    arc_data_file, "/data/mta4/www/RADIATION/ACE", "ace.html"
+)
 dsn_comms_file = functools.partial(
     arc_data_file, SKA / "data" / "dsn_summary", "dsn_summary.yaml"
 )
@@ -265,7 +267,7 @@ def get_web_data(data_dir):
 
     urls_file_funcs = [
         ("/acis/Fluence/current.dat", acis_fluence_file),
-        ("/mta/ace.html", ace_rates_file),
+        ("/mta/RADIATION/ACE/ace.html", ace_rates_file),
         ("/mta/ASPECT/dsn_summary/dsn_summary.yaml", dsn_comms_file),
     ]
 
@@ -631,7 +633,7 @@ def main(args_sys=None):
     comms_avail = get_comms_avail(now, stop)
     comms_avail_humans = get_comms_avail_for_humans(comms_avail)
 
-    states = kadi_states.get_states(start=start, stop=stop)
+    states = kadi_states.get_states(start=start, stop=stop, scenario="flight")
     radzones = get_radzones()
     comms = get_comms()
 

ruff-base.toml

@@ -1,5 +1,4 @@
-# Copied originally from pandas. This config requires ruff >= 0.2.
-target-version = "py311"
+target-version = "py312"
 
 # fix = true
 lint.unfixable = []
@@ -31,6 +30,7 @@ lint.extend-select = [
 "ARG001",  # Unused function argument
 "RSE102",  # Unnecessary parentheses on raised exception
 "PERF401",  # Use a list comprehension to create a transformed list
+"S101",  # Use of `assert` detected
 ]
 
 lint.ignore = [
@@ -40,10 +40,14 @@ lint.ignore = [
   "PLR2004", # Magic number
   "B028", # No explicit `stacklevel` keyword argument found
   "PLR0913", # Too many arguments to function call
+  "PLR1730", # Checks for if statements that can be replaced with min() or max() calls
+  "PLC0415", # `import` should be at the top-level of a file
+  "PLW1641", # Class implements `__hash__` if `__eq__` is implemented
 ]
 
 extend-exclude = [
   "docs",
+  "build",
 ]
 
 [lint.pycodestyle]
@@ -55,4 +59,5 @@ max-line-length = 100 # E501 reports lines that exceed the length of 100.
 # - D205: Don't worry about test docstrings
 # - ARG001: Unused function argument false positives for some fixtures
 # - E501: Line-too-long
-"**/tests/test_*.py" = ["D205", "ARG001", "E501"]
+# - S101: Do not use assert
+"**/tests/test_*.py" = ["D205", "ARG001", "E501", "S101"]

web_content.cfg

@@ -15,7 +15,7 @@
 </orbit_image>
 
   <goes>
-    url = https://cxc.cfa.harvard.edu/mta/RADIATION_new/GOES/goes_pchan_p.html
+    url = https://cxc.cfa.harvard.edu/mta/RADIATION/GOES/goes_pchan_p.html
     <content flux>
       <filter>
         tag = pre
@@ -32,7 +32,7 @@
   </goes>
 
   <ace>
-    url = https://cxc.harvard.edu/mta/ace.html
+    url = https://cxc.cfa.harvard.edu/mta/RADIATION/ACE/ace.html
     <content flux>
       <filter>
         tag = pre
@@ -46,7 +46,7 @@
       warn_age_hours = 2
       <filter>
         tag = img
-        src = mta_ace_plot\.gif
+        src = Plots/ace-epam-7-day.gif
       </filter>
     </image>
   </ace>