Changeset 8502 for trunk

Timestamp:

05/14/07 10:53:15 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (1 diff)
• mpedestal/MPedestalSubtract.cc (modified) (3 diffs)
• msignal/MExtractor.cc (modified) (1 diff)
• msignal/MExtractor.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2007/05/14 Thomas Bretz
+
+   * mjobs/MJCalibration.cc:
+     - fixed the unintentionally removed setting of pedestal 
+       for MPedestalSubtract
+
+   * mpedestal/MPedestalSubtract.cc:
+     - improved output for debugging purpose
+
+   * msignal/MExtractor.[h,cc]:
+     - according to the last changes the version number has been 
+       increased to 9
+
+
 
  2007/05/11 Daniela Dorner

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1802 +1802 @@
     // Produce pedestal subtracted raw-data
     MPedestalSubtract pedsub;
+    pedsub.SetPedestalCam(&pedcam);
     tlist.AddToList(&pedsub);
 

trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.4 2007-01-15 12:06:15 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.5 2007-05-14 09:53:15 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -105 +105 @@
         return kFALSE;
 
-    if (fPedestals || fNamePedestalCam.IsNull())
+    if (fPedestals)
+    {
+        *fLog << inf << "Pedestals given by pointer will be subtracted." << endl;
         return kTRUE;
+    }
+
+    if (fNamePedestalCam.IsNull())
+    {
+        *fLog << inf << "No name for MPedestalCam given, pedestal subtraction will be skipped." << endl;
+        return kTRUE;
+    }
 
     fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCam), "MPedestalCam");
@@ -114 +123 @@
         return kFALSE;
     }
+
+    *fLog << inf << "Pedestals " << fNamePedestalCam << " will be subtracted." << endl;
 
     return kTRUE;

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -79 +79 @@
 //  - Byte_t fSaturationLimit;
 //  + Uint_t fSaturationLimit;
+//
+// Class Version 9:
+// ----------------
+//  - MPedestalCam fPedestals
 //
 //

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -114 +114 @@
   void Print(Option_t *o="") const; //*MENU*
 
-  ClassDef(MExtractor, 8) // Signal Extractor Base Class
+  ClassDef(MExtractor, 9) // Signal Extractor Base Class
 };