Merge pull request #17 from acisops/Fall_2019_Re_Cal

Fall 2019 recalibration

dpa_check/Release_Notes_V2.5.0.txt

@@ -0,0 +1,67 @@
+
+Change Description
+==================
+
+The previous update to the 1DPAMZT model focused on calibrating for
+the Summer, 2019 cold season. It was stated that a new calibration
+would have to be completed for the Fall hot season.  This
+re-calibration addresses the variations across hot and cold seasons by
+incorporating a different method of calculating solar heat effects due
+to Earth's orbit.  This alleviated the need for seasonal
+re-calibrations.
+
+A general re-calibration was accomplished as well.
+
+
+Files Changed:
+============== 
+
+    __init__.py
+
+    dpa_model_spec.json
+
+    Release_Notes_V2.5.0.txt (this document)
+
+https://github.com/acisops/dpa_check/pull/17
+
+
+Testing:
+========
+
+The change was tested on the following loads:
+
+DEC0919
+DEC1619
+
+
+Interface impacts
+=================
+
+None.
+
+
+Summary of json file changes
+============================
+No new components added to the model. 
+
+There are parameter changes.
+
+A limits dictionary, specifying caution high and planning hi limits,
+was added to the "gui_config" section.
+
+
+
+Review
+====== 
+
+Reviewed by ACIS Ops.
+
+Presented to and approved by TWG.
+
+
+
+Deployment Plan
+===============
+
+Deploy after a new FOT Tools release has FDB approval. Will be running
+an ACIS Ops version off to the side.

dpa_check/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.4.0"
+__version__ = "2.5.0"
 
 from .dpa_check import \
     calc_model

dpa_check/dpa_model_spec.json

@@ -136,7 +136,7 @@
             "name": "clocking"
         },
         {
-            "class_name": "SolarHeatHrcOpts",
+            "class_name": "SolarHeatHrcMult",
             "init_args": [
                 "dpa0"
             ],
@@ -210,8 +210,10 @@
                 "fep_count": "fep_count",
                 "pow_states": [
                     "0xxx",
-                    "1xxx",
-                    "2xxx",
+                    "1xx0",
+                    "1xx1",
+                    "2xx0",
+                    "2xx1",
                     "3xx0",
                     "3xx1",
                     "4xx0",
@@ -234,20 +236,26 @@
             "name": "prop_heat__dpa0"
         }
     ],
-    "datestart": "2016:151:12:03:11.816",
-    "datestop": "2019:154:23:50:06.816",
+    "datestart": "2018:312:12:03:58.816",
+    "datestop": "2019:343:23:53:34.816",
     "dt": 328.0,
     "gui_config": {
-        "filename": "/home/gregg/THERMAL-MODELS/DPA-FITS/2019_JAN_HIGH_PITCH_FIT/MAY_31_2019/May_31_STEP_7.json",
+        "filename": "/home/gregg/THERMAL-MODELS/DPA-FITS/FALL_2019_RECAL/NOV_5/DEC_9_STEP_1.json",
+        "limits": {
+            "caution_hi": 39.5,
+            "planning_hi": 37.5
+        },
+        "msid": "1dpamzt",
         "plot_names": [
-            "1dpamzt data__time"
+            "1dpamzt data__time",
+            "solarheat__dpa0 solar_heat__pitch"
         ],
         "set_data_vals": {
             "dpa0": 20
         },
         "size": [
             1556,
-            1029
+            1028
         ]
     },
     "mval_names": [],
@@ -531,7 +539,7 @@
             "max": 1.0,
             "min": -1.0,
             "name": "ampl",
-            "val": 0.05246678962693188
+            "val": 0.03371678962693188
         },
         {
             "comp_name": "solarheat__dpa0",
@@ -627,20 +635,40 @@
             "comp_name": "dpa_power",
             "fmt": "{:.4g}",
             "frozen": true,
-            "full_name": "dpa_power__pow_1xxx",
+            "full_name": "dpa_power__pow_1xx0",
+            "max": 60,
+            "min": 15,
+            "name": "pow_1xx0",
+            "val": 27.207142999370895
+        },
+        {
+            "comp_name": "dpa_power",
+            "fmt": "{:.4g}",
+            "frozen": true,
+            "full_name": "dpa_power__pow_1xx1",
             "max": 60,
             "min": 15,
-            "name": "pow_1xxx",
+            "name": "pow_1xx1",
             "val": 27.207142999370895
         },
         {
             "comp_name": "dpa_power",
             "fmt": "{:.4g}",
             "frozen": true,
-            "full_name": "dpa_power__pow_2xxx",
+            "full_name": "dpa_power__pow_2xx0",
+            "max": 80,
+            "min": 20,
+            "name": "pow_2xx0",
+            "val": 38.74295469570052
+        },
+        {
+            "comp_name": "dpa_power",
+            "fmt": "{:.4g}",
+            "frozen": true,
+            "full_name": "dpa_power__pow_2xx1",
             "max": 80,
             "min": 20,
-            "name": "pow_2xxx",
+            "name": "pow_2xx1",
             "val": 38.74295469570052
         },
         {
@@ -681,7 +709,7 @@
             "max": 120,
             "min": 20,
             "name": "pow_4xx1",
-            "val": 59.05
+            "val": 60.5
         },
         {
             "comp_name": "dpa_power",