Changeset 5548

Timestamp:

12/02/04 15:15:02 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (5 diffs)
• msignal/MExtractTime.cc (modified) (1 diff)
• msignal/MExtractTimeAndCharge.cc (modified) (1 diff)
• msignal/MExtractor.cc (modified) (2 diffs)
• msignal/MExtractor.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/12/02: Thomas Bretz
+
+   * msignal/MExtractTime.cc, msignal/MExtractTimeAndCharge.cc,
+     msignal/MExtractor.cc:
+     - removed obsolete output after FindCreateObj
+
+   * msignal/MExtractor.h:
+     - don't write fNoiseCalculation to file
+
+
+
  2004/12/01: Markus Gaug and Thomas Schweizer
  
@@ -29 +40 @@
 
 
+
  2004/12/01: Markus Gaug
 
@@ -34 +46 @@
      - introduced a random iterator for the "pedestal" calculation of 
        the amplitude spline.
-
 
    * msignal/MExtractTimeAndChargeDigitalFilter.cc:
@@ -44 +55 @@
 
 
+
  2004/11/30: Thomas Bretz
  
    * msignal/MExtractTimeAndChargeDigitalFilter.cc:
      - InitArrays: added missing return statement
+
+
 
  2004/11/30: Markus Gaug
@@ -86 +100 @@
    * callisto.rc
      - updated pedestal initializations
+
 
 

trunk/MagicSoft/Mars/msignal/MExtractTime.cc

@@ -127 +127 @@
   fArrTime = (MArrivalTimeCam*)pList->FindCreateObj("MArrivalTimeCam",AddSerialNumber(fNameTimeCam));
   if (!fArrTime)
-    {
-      *fLog << err << fNameTimeCam.Data() << " could not be found nor created... aborting" << endl;
       return kFALSE;
-    }
 
   fPedestals = (MPedestalCam*)pList->FindObject( AddSerialNumber(fNamePedestalCam), "MPedestalCam");

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -114 +114 @@
   fSignals = (MExtractedSignalCam*)pList->FindCreateObj("MExtractedSignalCam",AddSerialNumber(fNameSignalCam));
   if (!fSignals)
-    {
-      *fLog << err << fNameSignalCam.Data() << " could not be found nor created... aborting" << endl;
       return kFALSE;
-    }
   
   return kTRUE;

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -163 +163 @@
   if (!fPedestals)
     {
-      *fLog << err << fNamePedestalCam.Data() << " not found... aborting" << endl;
+      *fLog << err << fNamePedestalCam << " not found... aborting" << endl;
       return kFALSE;
     }
@@ -169 +169 @@
   fSignals = (MExtractedSignalCam*)pList->FindCreateObj("MExtractedSignalCam",AddSerialNumber(fNameSignalCam));
   if (!fSignals)
-    {
-      *fLog << err << fNameSignalCam.Data() << " could not be found nor created... aborting" << endl;
       return kFALSE;
-    }
   
   return kTRUE;

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -26 +26 @@
   static const Float_t fgOffsetLoGain;     //! Default for fOffsetLoGain (now set to 1.51 (= 5ns)
   
-  Bool_t  fNoiseCalculation;               // Flag if extractor determines noise contribution from pedestal file.
+  Bool_t  fNoiseCalculation;               //! Flag if extractor determines noise contribution from pedestal file.
   
 protected: