Changeset 8554 for trunk/MagicSoft

Timestamp:

06/13/07 08:53:24 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mhcalib/MHCalibrationPulseTimeCam.h (modified) (4 diffs)
• mimage/MImgCleanStd.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.h

@@ -14 +14 @@
 private:
 
-  static const Byte_t  fgSaturationLimit;      //! Default for fSaturationLimit (now set to: 245)
-  static const Byte_t  fgLowerSignalLimit;     //! Default for fLowerSignalLimit
+  static const UInt_t  fgSaturationLimit;      //! Default for fSaturationLimit (now set to: 245)
+  static const UInt_t  fgLowerSignalLimit;     //! Default for fLowerSignalLimit
   static const Int_t   fgNumPixelsRequired;    //! Default for fNumPixelsRequired
 
@@ -29 +29 @@
   static const TString gsHistXTitle;           //! Default Histogram x-axis titles
   static const TString gsHistYTitle;           //! Default Histogram y-axis titles
-  
-  Byte_t  fSaturationLimit;                    // Highest FADC slice value until being declared saturated
-  Byte_t  fLowerSignalLimit;                   // Lower signal limit for pulse time extraction
+
+  UInt_t  fSaturationLimit;                    // Highest FADC slice value until being declared saturated
+  UInt_t  fLowerSignalLimit;                   // Lower signal limit for pulse time extraction
   Int_t   fNumPixelsRequired;                  // Minimum Number of pixels required for averageing
-  
+
   TString fReferenceFile;                      // File name containing the reference values
 
@@ -59 +59 @@
   MHCalibrationPulseTimeCam(const char *name=NULL, const char *title=NULL);
   ~MHCalibrationPulseTimeCam() {}
-  
+
   // Clone
   TObject *Clone(const char *name="") const;
@@ -67 +67 @@
 
   void SetReferenceFile    ( const TString ref=fgReferenceFile     ) { fReferenceFile     = ref; }
-  void SetSaturationLimit  ( const Byte_t  lim=fgSaturationLimit   ) { fSaturationLimit   = lim; }
-  void SetLowerSignalLimit ( const Byte_t  lim=fgLowerSignalLimit  ) { fLowerSignalLimit  = lim; }
+  void SetSaturationLimit  ( const UInt_t  lim=fgSaturationLimit   ) { fSaturationLimit   = lim; }
+  void SetLowerSignalLimit ( const UInt_t  lim=fgLowerSignalLimit  ) { fLowerSignalLimit  = lim; }
   void SetNumPixelsRequired( const Byte_t  lim=fgNumPixelsRequired ) { fNumPixelsRequired = lim; }
-  
+
   Bool_t GetPixelContent ( Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const { return kTRUE; }
   void   DrawPixelContent( Int_t num )  const;    
 
-  ClassDef(MHCalibrationPulseTimeCam, 1)        // Histogram class for Pulse Time Checks
+  ClassDef(MHCalibrationPulseTimeCam, 2)        // Histogram class for Pulse Time Checks
 };
 

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -699 +699 @@
     *fLog << " (CleanRings=" << fCleanRings << ")" << endl;
 
-    *fLog << "Name of MPedPhotCam container used: ";
-    *fLog << (fPed?((MParContainer*)fPed)->GetName():(const char*)fNamePedPhotCam) << endl;
+    if (fCleaningMethod!=kAbsolute && fCleaningMethod!=kTime)
+    {
+        *fLog << "Name of MPedPhotCam container used: ";
+        *fLog << (fPed?((MParContainer*)fPed)->GetName():(const char*)fNamePedPhotCam) << endl;
+    }
 }