Changeset 2994 for trunk/MagicSoft/Mars/mcalib

Timestamp:

01/30/04 20:33:42 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -213 +213 @@
 
     fArrivalTime  = (MArrivalTime*)pList->FindObject("MArrivalTime");
-
-    if (!fArrivalTime)
-      CLRBIT(fFlags,kUseTimes);
 
     fEvtTime      = (MTime*)pList->FindObject("MTime");
@@ -458 +455 @@
 
       if (TESTBIT(fFlags,kUseTimes))
-        mtime = (*fArrivalTime)[pixid];
+        {
+          //
+          // first, have a look in MArrivalTime, 
+          // otherwise search the position of maximum bin 
+          // in MRawEvtData
+          //
+          if (fArrivalTime)
+            mtime = (*fArrivalTime)[pixid];
+          else
+            if (sig.IsLoGainUsed())
+              fRawEvt->GetPixelContent(mtime, pixid, NULL, 4);
+            else
+              fRawEvt->GetPixelContent(mtime, pixid, NULL, 3);
+        }
       
       switch(pixid)