diff --git a/arc3.cfg b/arc3.cfg index 90fbe2c..898afed 100644 --- a/arc3.cfg +++ b/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 diff --git a/make_timeline.py b/make_timeline.py index fa5f6bc..cda61b0 100755 --- a/make_timeline.py +++ b/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), ] diff --git a/web_content.cfg b/web_content.cfg index b73cd0f..00e22f6 100644 --- a/web_content.cfg +++ b/web_content.cfg @@ -15,7 +15,7 @@ - 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 tag = pre @@ -32,7 +32,7 @@ - url = https://cxc.harvard.edu/mta/ace.html + url = https://cxc.cfa.harvard.edu/mta/RADIATION/ACE/ace.html tag = pre @@ -46,7 +46,7 @@ warn_age_hours = 2 tag = img - src = mta_ace_plot\.gif + src = Plots/ace-epam-7-day.gif