Updates

acisops · Feb 20, 2019 · 1c06689 · 1c06689
1 parent c40513b
commit 1c06689
Show file tree

Hide file tree

Showing 10 changed files with 326 additions and 109 deletions.
diff --git a/acispy/__init__.py b/acispy/__init__.py
@@ -8,7 +8,7 @@
     TenDayTracelogData, MaudeData, TelemData
 from acispy.plots import DatePlot, MultiDatePlot, \
     PhaseScatterPlot, PhaseHistogramPlot, CustomDatePlot
-from acispy.thermal_models import SimulateCTIRun, \
+from acispy.thermal_models import SimulateECSRun, \
     ThermalModelRunner, ThermalModelFromLoad, \
     ThermalModelFromFiles, SimulateSingleObs
 from acispy.load_review import ACISLoadReview

diff --git a/doc/source/Derived_Fields.ipynb b/doc/source/Derived_Fields.ipynb
@@ -297,7 +297,7 @@
  "metadata": {
   "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python [default]",
+   "display_name": "Python [conda env:ska3]",
    "language": "python",
    "name": "python3"
   },

diff --git a/doc/source/Load_Review.ipynb b/doc/source/Load_Review.ipynb
@@ -313,7 +313,7 @@
  "metadata": {
   "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python [default]",
+   "display_name": "Python [conda env:ska3]",
    "language": "python",
    "name": "python3"
   },

diff --git a/doc/source/Plotting_Data.ipynb b/doc/source/Plotting_Data.ipynb
@@ -814,7 +814,7 @@
  "metadata": {
   "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python [default]",
+   "display_name": "Python [conda env:ska3]",
    "language": "python",
    "name": "python3"
   },

diff --git a/doc/source/Thermal_Models.ipynb b/doc/source/Thermal_Models.ipynb
diff --git a/doc/source/_images/cti_run.png → doc/source/_images/ecs_run.png b/doc/source/_images/cti_run.png → doc/source/_images/ecs_run.png
diff --git a/doc/source/_images/cti_run2.png → doc/source/_images/ecs_run2.png b/doc/source/_images/cti_run2.png → doc/source/_images/ecs_run2.png
diff --git a/doc/source/_images/cti_run3.png → doc/source/_images/ecs_run3.png b/doc/source/_images/cti_run3.png → doc/source/_images/ecs_run3.png
diff --git a/doc/source/command_line.rst b/doc/source/command_line.rst
@@ -274,35 +274,40 @@ Returns:
 
 .. image:: _images/plot_msid.png
 
-``simulate_cti_run``
+``simulate_ecs_run``
 --------------------
 
 .. code-block:: text
 
-    usage: simulate_cti_run [-h] [--days DAYS] [--simpos SIMPOS]
+    usage: simulate_ecs_run [-h] [--vehicle_load VEHICLE_LOAD] [--simpos SIMPOS]
                             [--off_nominal_roll OFF_NOMINAL_ROLL]
                             [--dh_heater DH_HEATER]
-                            component tstart T_init pitch ccd_count
+                            component tstart tstop T_init pitch ccd_count
 
-    Simulate a CTI run.
+    Simulate an ECS run.
 
     positional arguments:
       component             The component to model: dpa, dea, or psmc.
-      tstart                The start time in YYYY:DOY:HH:MM:SS format
+      tstart                The start time of the ECS run in YYYY:DOY:HH:MM:SS format
+      tstop                 The start time of the ECS run in YYYY:DOY:HH:MM:SS format
       T_init                The initial temperature of the component in degrees C.
       pitch                 The pitch in degrees.
       ccd_count             The number of CCDs to clock.
 
     optional arguments:
       -h, --help            show this help message and exit
-      --days DAYS           The number of days to run the model. Default: 3.0
+      --vehicle_load VEHICLE_LOAD
+                            The vehicle load which is running. Default: None,
+                            meaning no vehicle load. If this parameter is set, the
+                            input values of pitch and off-nominal roll will be
+                            ignored and the values from the vehicle load will be
+                            used.
       --simpos SIMPOS       The SIM position. Default: -99616.0
       --off_nominal_roll OFF_NOMINAL_ROLL
                             The off-nominal roll. Default: 0.0
       --dh_heater DH_HEATER
                             Is the DH heater on (1) or off (0)? Default: 0/off.
 
-
 Example 1
 +++++++++
 
@@ -317,7 +322,7 @@ To run the 1DPAMZT model with the following conditions:
 
 .. code-block:: bash
 
-    [~]$ simulate_cti_run dpa 2015:100:12:45:30 2015:101:12:45:30 10.0 150. 6 --off_nominal_roll 12.0
+    [~]$ simulate_ecs_run dpa 2015:100:12:45:30 2015:101:12:45:30 10.0 150. 6 --off_nominal_roll 12.0
 
 Returns:
 
@@ -336,9 +341,9 @@ Returns:
     acispy: [INFO     ] 2017-09-14 14:23:36,931 Model Result
     acispy: [INFO     ] 2017-09-14 14:23:36,931 ------------
     acispy: [INFO     ] 2017-09-14 14:23:36,932 The limit of 35.5 degrees C will be reached at 2015:100:21:12:32.816, after 30.4228 ksec.
-    acispy: [INFO     ] 2017-09-14 14:23:36,932 The limit is reached before the end of the CTI run.
-    acispy: [WARNING  ] 2017-09-14 14:23:36,932 This CTI run is NOT safe from a thermal perspective.
-    acispy: [INFO     ] 2017-09-14 14:23:37,499 Image of the model run has been written to cti_run_dpa_6chip_2015:100:12:45:30.png.
+    acispy: [INFO     ] 2017-09-14 14:23:36,932 The limit is reached before the end of the observation.
+    acispy: [WARNING  ] 2017-09-14 14:23:36,932 This observation is NOT safe from a thermal perspective.
+    acispy: [INFO     ] 2017-09-14 14:23:37,499 Image of the model run has been written to ecs_run_dpa_6chip_2015:100:12:45:30.png.
 
 .. image:: _images/cti_run.png
 
@@ -356,7 +361,7 @@ To run the 1DEAMZT model with the following conditions:
 
 .. code-block:: bash
 
-    [~]$ simulate_cti_run dea 2017:069:15:40:00 2017:070:10:00:00 7.5 150. 4 --off_nominal_roll 0.0
+    [~]$ simulate_ecs_run dea 2017:069:15:40:00 2017:070:10:00:00 7.5 150. 4 --off_nominal_roll 0.0
 
 Returns:
 
@@ -375,10 +380,10 @@ Returns:
     acispy: [INFO     ] 2017-09-14 14:26:16,009 Model Result
     acispy: [INFO     ] 2017-09-14 14:26:16,009 ------------
     acispy: [INFO     ] 2017-09-14 14:26:16,009 The limit of 35.5 degrees C is never reached.
-    acispy: [INFO     ] 2017-09-14 14:26:16,009 This CTI run is safe from a thermal perspective.
-    acispy: [INFO     ] 2017-09-14 14:26:16,546 Image of the model run has been written to cti_run_dea_4chip_2017:069:15:40:00.png.
+    acispy: [INFO     ] 2017-09-14 14:26:16,009 This observation is safe from a thermal perspective.
+    acispy: [INFO     ] 2017-09-14 14:26:16,546 Image of the model run has been written to ecs_run_dea_4chip_2017:069:15:40:00.png.
 
-.. image:: _images/cti_run2.png
+.. image:: _images/ecs_run2.png
 
 Example 3
 +++++++++
@@ -398,7 +403,7 @@ To run the 1DPAMZT model with the following conditions:
 
 .. code-block:: bash
 
-    [~]$ simulate_cti_run dpa 2017:256:03:20:00 2017:257:15:20:00 10.0 0.0 6 --vehicle_load SEP0917C
+    [~]$ simulate_ecs_run dpa 2017:256:03:20:00 2017:257:15:20:00 10.0 0.0 6 --vehicle_load SEP0917C
 
 Returns:
 
@@ -418,11 +423,11 @@ Returns:
     acispy: [INFO     ] 2017-09-14 15:40:30,686 Model Result
     acispy: [INFO     ] 2017-09-14 15:40:30,686 ------------
     acispy: [INFO     ] 2017-09-14 15:40:30,686 The limit of 35.5 degrees C will be reached at 2017:256:09:17:34.816, after 21.4548 ksec.
-    acispy: [INFO     ] 2017-09-14 15:40:30,686 The limit is reached before the end of the CTI run.
-    acispy: [WARNING  ] 2017-09-14 15:40:30,686 This CTI run is NOT safe from a thermal perspective.
-    acispy: [INFO     ] 2017-09-14 15:40:31,526 Image of the model run has been written to cti_run_dpa_6chip_2017:256:03:20:00.png.
+    acispy: [INFO     ] 2017-09-14 15:40:30,686 The limit is reached before the end of the observation.
+    acispy: [WARNING  ] 2017-09-14 15:40:30,686 This observation is NOT safe from a thermal perspective.
+    acispy: [INFO     ] 2017-09-14 15:40:31,526 Image of the model run has been written to ecs_run_dpa_6chip_2017:256:03:20:00.png.
 
-.. image:: _images/cti_run3.png
+.. image:: _images/ecs_run3.png
 
 ``phase_scatter_plot``
 ----------------------

diff --git a/scripts/simulate_cti_run → scripts/simulate_ecs_run b/scripts/simulate_cti_run → scripts/simulate_ecs_run
@@ -8,10 +8,10 @@ short_name = {"dea": "1deamzt",
               "dpa": "1dpamzt",
               "psmc": "1pdeaat"}
 
-parser = argparse.ArgumentParser(description='Simulate a CTI run.')
+parser = argparse.ArgumentParser(description='Simulate an ECS run.')
 parser.add_argument("component", type=str, help='The component to model: dpa, dea, or psmc.')
-parser.add_argument("tstart", type=str, help='The start time of the CTI run in YYYY:DOY:HH:MM:SS format')
-parser.add_argument("tstop", type=str, help='The start time of the CTI run in YYYY:DOY:HH:MM:SS format')
+parser.add_argument("tstart", type=str, help='The start time of the ECS run in YYYY:DOY:HH:MM:SS format')
+parser.add_argument("tstop", type=str, help='The start time of the ECS run in YYYY:DOY:HH:MM:SS format')
 parser.add_argument("T_init", type=float, help='The initial temperature of the component in degrees C.')
 parser.add_argument("pitch", type=float, help='The pitch in degrees.')
 parser.add_argument("ccd_count", type=int, help="The number of CCDs to clock.")
@@ -26,12 +26,12 @@ parser.add_argument("--dh_heater", type=int, default=0, help="Is the DH heater o
 
 args = parser.parse_args()
 
-cti_run = acispy.SimulateCTIRun(short_name[args.component], args.tstart, args.tstop, args.T_init, 
+ecs_run = acispy.SimulateECSRun(short_name[args.component], args.tstart, args.tstop, args.T_init,
                                 args.pitch, args.ccd_count, vehicle_load=args.vehicle_load,
                                 simpos=args.simpos, off_nominal_roll=args.off_nominal_roll, 
                                 dh_heater=args.dh_heater)
 
-dp = cti_run.plot_model()
-filename = "cti_run_%s_%dchip_%s.png" % (args.component, args.ccd_count, args.tstart)
+dp = ecs_run.plot_model()
+filename = "ecs_run_%s_%dchip_%s.png" % (args.component, args.ccd_count, args.tstart)
 dp.savefig(filename)
 mylog.info("Image of the model run has been written to %s." % filename)