Changeset 15278 for trunk/Mars/mcore

Timestamp:

04/08/13 13:07:15 (12 years ago)

Author:

lyard

Message:

fixed wrong run type display, fixed calibration loading

File:

• trunk/Mars/mcore/DrsCalib.h (modified) (1 diff)

trunk/Mars/mcore/DrsCalib.h

@@ -1037 +1037 @@
         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");
+        if (file.HasKey("DATE-OBS"))
+            fDateObs   = file.GetStr("DATE-OBS");
+        if (file.HasKey("DATE-END"))
+            fDateEnd   = file.GetStr("DATE-END");
+
+        if (file.HasKey("RUN0-BEG"))
+            fDateRunBeg[0]= file.GetStr("RUN0-BEG");
+        if (file.HasKey("RUN1-BEG"))
+            fDateRunBeg[1]= file.GetStr("RUN1-BEG");
+        if (file.HasKey("RUN2-BEG"))
+            fDateRunBeg[2]= file.GetStr("RUN2-BEG");
+        if (file.HasKey("RUN0-END"))
+            fDateRunEnd[0]= file.GetStr("RUN0-END");
+        if (file.HasKey("RUN1-END"))
+            fDateRunEnd[1]= file.GetStr("RUN1-END");
+        if (file.HasKey("RUN2-END"))
+            fDateRunEnd[2]= file.GetStr("RUN2-END");
 /*
         fDAC[0]    = file.GetUInt("DAC_A");