Changeset 5592

Timestamp:

12/14/04 16:24:04 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractor.cc (modified) (2 diffs)
• MExtractor.h (modified) (1 diff)

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -117 +117 @@
     SetNameSignalCam();
     SetOffsetLoGain();
-    SetRange();
     SetSaturationLimit();
     SetNoiseCalculation(kFALSE);
@@ -160 +159 @@
     }
   
-  fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCam), "MPedestalCam");
+
   if (!fPedestals)
     {
-      *fLog << err << fNamePedestalCam << " not found... aborting" << endl;
-      return kFALSE;
+      fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCam), "MPedestalCam");
+      if (!fPedestals)
+        {
+          *fLog << err << fNamePedestalCam << " not found... aborting" << endl;
+          return kFALSE;
+        }
     }
   

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -88 +88 @@
   void SetNoiseCalculation( const Bool_t   b=kTRUE                   ) { fNoiseCalculation = b;    }
 
+  void SetPedestals (MPedestalCam *pedcam)   { fPedestals = pedcam; }
+
   void Print(Option_t *o="") const;