Changeset 15008 for trunk/Mars

Timestamp:

03/10/13 11:59:47 (12 years ago)

Author:

tbretz

Message:

Added data mebers to store begin and end date of runs and drs calib; added reading and writing of these data-members.

File:

• trunk/Mars/mcore/DrsCalib.h (modified) (5 diffs)

trunk/Mars/mcore/DrsCalib.h

@@ -946 +946 @@
     uint16_t fNumTm; // Number of time marker channels in trgoff
 
+    std::string fDateObs;
+    std::string fDateRunObs[3];
+    std::string fDateRunEnd[3];
+    std::string fDateEnd;
+
 //    uint16_t fDAC[8];
 
@@ -955 +960 @@
         fNumGain(2000),
         fNumTrgOff(1),
-        fStep(0)
-    {
+        fStep(0),
+        fDateObs("1970-01-01T00:00:00"),
+        fDateEnd("1970-01-01T00:00:00")
+    {
+        for (int i=0; i<3; i++)
+        {
+            fDateRunBeg[i] = "1970-01-01T00:00:00";
+            fDateRunEnd[i] = "1970-01-01T00:00:00";
+        }
     }
 
@@ -972 +984 @@
 
         fStep = 0;
+
+        fDateObs = "1970-01-01T00:00:00";
+        fDateEnd = "1970-01-01T00:00:00";
+
+        for (int i=0; i<3; i++)
+        {
+            fDateRunBeg[i] = "1970-01-01T00:00:00";
+            fDateRunEnd[i] = "1970-01-01T00:00:00";
+        }
     }
 
@@ -1015 +1036 @@
         fRoi       = file.GetUInt("NROI");
         fNumTm     = file.HasKey("NTM") ? file.GetUInt("NTM") : 0;
+
+        fDateObs   = file.GetStr("DATE-OBS");
+        fDateEnd   = file.GetStr("DATE-END");
+
+        fDateRunBeg[0]= file.GetStr("RUN0-BEG");
+        fDateRunBeg[1]= file.GetStr("RUN1-BEG");
+        fDateRunBeg[2]= file.GetStr("RUN2-BEG");
+        fDateRunEnd[0]= file.GetStr("RUN0-END");
+        fDateRunEnd[1]= file.GetStr("RUN1-END");
+        fDateRunEnd[2]= file.GetStr("RUN2-END");
 /*
         fDAC[0]    = file.GetUInt("DAC_A");
@@ -1148 +1179 @@
         DataWriteFits2::WriteDefaultKeys(file);
 #endif
+        file.SetStr("DATE-OBS", fDateObs, "First event of whole DRS calibration");
+        file.SetStr("DATE-END", fDateEnd, "Last event of whole DRS calibration");
+        file.SetStr("RUN0-BEG", fDateRunBeg[0], "First event of run 0");
+        file.SetStr("RUN1-BEG", fDateRunBeg[1], "First event of run 1");
+        file.SetStr("RUN2-BEG", fDateRunBeg[2], "First event of run 2");
+        file.SetStr("RUN0-END", fDateRunEnd[0], "Last event of run 0");
+        file.SetStr("RUN1-END", fDateRunEnd[1], "Last event of run 1");
+        file.SetStr("RUN2-END", fDateRunEnd[2], "Last event of run 2");
+
         file.SetInt("STEP", fStep, "");