Changeset 5601 for trunk/MagicSoft/Mars/msignal

Timestamp:

12/15/04 10:25:49 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MArrivalTimeCam.h (modified) (1 diff)
• MExtractTime.cc (modified) (1 diff)
• MExtractTimeAndCharge.cc (modified) (1 diff)
• MExtractedSignalCam.h (modified) (1 diff)
• MExtractor.cc (modified) (2 diffs)
• MExtractor.h (modified) (1 diff)

trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.h

@@ -32 +32 @@
     void Clear(Option_t *o="");
     void SetLogStream(MLog *lg);
+    void Reset() { Clear(); }
 
     void InitSize(const UInt_t i);

trunk/MagicSoft/Mars/msignal/MExtractTime.cc

@@ -110 +110 @@
 Int_t MExtractTime::PreProcess(MParList *pList)
 {
-  fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData"));
-  if (!fRawEvt)
-    {
-        *fLog << err << AddSerialNumber("MRawEvtData") << " not found... aborting." << endl;
-        return kFALSE;
-    }
-  
-  fRunHeader = (MRawRunHeader*)pList->FindObject(AddSerialNumber("MRawRunHeader"));
-  if (!fRunHeader)
-    {
-      *fLog << err << AddSerialNumber("MRawRunHeader") << " not found... aborting." << endl;
-      return kFALSE;
-    }
-  
-  
   fArrTime = (MArrivalTimeCam*)pList->FindCreateObj("MArrivalTimeCam",AddSerialNumber(fNameTimeCam));
   if (!fArrTime)
       return kFALSE;
 
-  fPedestals = (MPedestalCam*)pList->FindObject( AddSerialNumber(fNamePedestalCam), "MPedestalCam");
-  if (!fPedestals)
-    {
-      *fLog << err << AddSerialNumber("MPedestalCam") << " not found... aborting" << endl;
-      return kFALSE;
-    }
-  
-  return kTRUE;
+  return PreProcessStd(pList);
 }
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -159 +159 @@
 Int_t MExtractTimeAndCharge::Process()
 {
+    // This cleaning is nor necessary: It is done automatically by
+    // Reset() before each execution of the Tasklist (Process())
+    //  fArrTime->Clear();
+    //  fSignals->Clear();
 
   MRawEvtPixelIter pixel(fRawEvt);
-  fArrTime->Clear();
-  fSignals->Clear();
 
   while (pixel.Next())

trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.h

@@ -35 +35 @@
     void Clear(Option_t *o="");
     void SetLogStream(MLog *lg);
+    void Reset() { Clear(); }
 
     void InitSize(const UInt_t i);

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -130 +130 @@
 }
 
+Int_t MExtractor::PreProcessStd(MParList *pList)
+{
+    fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData"));
+    if (!fRawEvt)
+    {
+        *fLog << err << AddSerialNumber("MRawEvtData") << " not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fRunHeader = (MRawRunHeader*)pList->FindObject(AddSerialNumber("MRawRunHeader"));
+    if (!fRunHeader)
+    {
+        *fLog << err << AddSerialNumber("MRawRunHeader") << " not found... aborting." << endl;
+        return kFALSE;
+    }
+
+
+    if (fPedestals)
+        return kTRUE;
+
+    fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCam), "MPedestalCam");
+    if (!fPedestals)
+    {
+        *fLog << err << fNamePedestalCam << " not found... aborting" << endl;
+        return kFALSE;
+    }
+
+    return kTRUE;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -144 +174 @@
 Int_t MExtractor::PreProcess(MParList *pList)
 {
-
-  fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData"));
-  if (!fRawEvt)
-    {
-      *fLog << err << AddSerialNumber("MRawEvtData") << " not found... aborting." << endl;
-      return kFALSE;
-    }
-  
-  fRunHeader = (MRawRunHeader*)pList->FindObject(AddSerialNumber("MRawRunHeader"));
-  if (!fRunHeader)
-    {
-      *fLog << err << AddSerialNumber("MRawRunHeader") << " not found... aborting." << endl;
-      return kFALSE;
-    }
-  
-
-  if (!fPedestals)
-    {
-      fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCam), "MPedestalCam");
-      if (!fPedestals)
-        {
-          *fLog << err << fNamePedestalCam << " not found... aborting" << endl;
-          return kFALSE;
-        }
-    }
-  
-  fSignals = (MExtractedSignalCam*)pList->FindCreateObj("MExtractedSignalCam",AddSerialNumber(fNameSignalCam));
-  if (!fSignals)
-      return kFALSE;
-  
-  return kTRUE;
+    fSignals = (MExtractedSignalCam*)pList->FindCreateObj("MExtractedSignalCam",AddSerialNumber(fNameSignalCam));
+    if (!fSignals)
+        return kFALSE;
+
+    return PreProcessStd(pList);
 }
 

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -62 +62 @@
   virtual void FindSignalLoGain(Byte_t *firstused, Float_t &sum, Byte_t &sat) const { }
   
+  Int_t   PreProcessStd(MParList *pList);
   Int_t   PreProcess( MParList *pList );
   Bool_t  ReInit    ( MParList *pList );