Changeset 2994

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MExtractSignal.cc (modified) (4 diffs)
• mcalib/MCalibrationCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -102 +102 @@
        number)
 
-
+   * manalysis/MExtractSignal.cc
+     - not access to MArrivalTime any more. The same information is 
+       stored in MRawEvt->GetPixelContent(...)
+
+   * manalysis/MCalibrationCalc.cc
+     - retrieve default arrival time from MRawEvt 
 
  2004/01/29: Abelardo Moralejo

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -46 +46 @@
 #include "MExtractedSignalPix.h"
 
-#include "MArrivalTime.h"
-
 ClassImp(MExtractSignal);
 
@@ -114 +112 @@
 
     fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
+
     if (!fPedestals)
     {
@@ -120 +119 @@
     }
 
-    fArrivalTime = (MArrivalTime*)pList->FindCreateObj(AddSerialNumber("MArrivalTime"));
-    if (!fArrivalTime)
-        return kFALSE;
-    
     return kTRUE;
 }
@@ -206 +201 @@
 
         pix.SetGainSaturation(satHi, satHi, satLo);
-
-        fArrivalTime->SetTime(pixid, satHi?midlo:midhi);
 
       } /* while (pixel.Next()) */

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)