Changeset 12503 for trunk/Mars

Timestamp:

11/12/11 16:10:30 (13 years ago)

Author:

tbretz

Message:

Make sure that we don't get exceptions from old drs calib files without time marker channels (NTM)

File:

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

trunk/Mars/mcore/DrsCalib.h

@@ -471 +471 @@
         fNumTrgOff = file.GetUInt("NBTRGOFF");
         fRoi       = file.GetUInt("NROI");
-        fNumTm     = file.GetUInt("NTM");
+        fNumTm     = file.HasKey("NTM") ? file.GetUInt("NTM") : 0;
 /*
         fDAC[0]    = file.GetUInt("DAC_A");
@@ -486 +486 @@
         file.SetPtrAddress("RunNumberGain",          base+2, 1);
         file.SetPtrAddress("RunNumberTriggerOffset", base+3, 1);
-        file.SetPtrAddress("BaselineMean",           base+4+0*1024*1440,                           1024*1440);
-        file.SetPtrAddress("BaselineRms",            base+4+1*1024*1440,                           1024*1440);
-        file.SetPtrAddress("GainMean",               base+4+2*1024*1440,                           1024*1440);
-        file.SetPtrAddress("GainRms",                base+4+3*1024*1440,                           1024*1440);
-        file.SetPtrAddress("TriggerOffsetMean",      base+4+4*1024*1440,                           fRoi*1440);
-        file.SetPtrAddress("TriggerOffsetRms",       base+4+4*1024*1440+   fRoi*1440,              fRoi*1440);
-        file.SetPtrAddress("TriggerOffsetTMMean",    base+4+4*1024*1440+ 2*fRoi*1440,              fRoi*fNumTm);
-        file.SetPtrAddress("TriggerOffsetTMRms",     base+4+4*1024*1440+ 2*fRoi*1440+ fRoi*fNumTm, fRoi*fNumTm);
+        file.SetPtrAddress("BaselineMean",           base+4+0*1024*1440,           1024*1440);
+        file.SetPtrAddress("BaselineRms",            base+4+1*1024*1440,           1024*1440);
+        file.SetPtrAddress("GainMean",               base+4+2*1024*1440,           1024*1440);
+        file.SetPtrAddress("GainRms",                base+4+3*1024*1440,           1024*1440);
+        file.SetPtrAddress("TriggerOffsetMean",      base+4+4*1024*1440,           fRoi*1440);
+        file.SetPtrAddress("TriggerOffsetRms",       base+4+4*1024*1440+fRoi*1440, fRoi*1440);
+        if (fNumTm>0)
+        {
+            file.SetPtrAddress("TriggerOffsetTMMean", base+4+4*1024*1440+ 2*fRoi*1440,              fRoi*fNumTm);
+            file.SetPtrAddress("TriggerOffsetTMRms",  base+4+4*1024*1440+ 2*fRoi*1440+ fRoi*fNumTm, fRoi*fNumTm);
+        }
 
         if (!file.GetNextRow())