Changeset 15278 for trunk

Timestamp:

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

Author:

lyard

Message:

fixed wrong run type display, fixed calibration loading

Location:

trunk

Files:

• FACT++/gui/RawEventsViewer/RawEventsViewer.cc (modified) (4 diffs)
• Mars/mcore/DrsCalib.h (modified) (1 diff)

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

@@ -260 +260 @@
 void RawDataViewer::drawPixelCurve()
 {
-    float xZoom, yZoom;
-    xZoom = yZoom = 1.0f;
     float xRange = bboxMax[0] - bboxMin[0];
     float yRange = bboxMax[1] - bboxMin[1];
@@ -377 +375 @@
     fIsDrsCalibration = false;
     SetAutoRefresh(true);
-
+    runType = "unkown";
     PixelMap mypMap;
     if (!mypMap.Read("/swdev_nfs/FACT++/FACTmap111030.txt"))
@@ -597 +595 @@
     runNumber =      inputFile->HasKey("RUNID") ?  inputFile->GetInt("RUNID") : -1;
     nTM =            inputFile->HasKey("NTMARK") ? inputFile->GetInt("NTMARK") : 0;
-    runType =        inputFile->HasKey("RUNTYPE") ? inputFile->GetInt("RUNTYPE") : -1;
+
+    runType = "unkown";
+    if (inputFile->HasKey("RUNTYPE"))
+    {
+        runType = inputFile->GetStr("RUNTYPE");
+        if (runType == "")
+            runType = "unkown";
+    }
     firstDataTime =  inputFile->HasKey("TSTART") ? inputFile->GetInt("TSTART") : -1;
     lastDataTime =   inputFile->HasKey("TSTOP") ? inputFile->GetInt("TSTOP"): -1;
@@ -751 +756 @@
     catch (const runtime_error &e)
     {
-        msg = e.what();
-    }
-
+        msg = string("Something went wrong while loading Drs Calib: ") + e.what() + string(".. Aborting file loading");
+    }
     cerr << msg << endl;
     fDrsCalib.Clear();

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");