Changeset 8142 for trunk/MagicSoft/Mars

Timestamp:

10/20/06 19:50:35 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (2 diffs)
• MCalibrationChargeCalc.h (modified) (2 diffs)
• MCalibrationRelTimeCalc.cc (modified) (6 diffs)
• MCalibrationRelTimeCalc.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.168 2006-10-20 18:49:53 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.169 2006-10-20 18:50:35 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -771 +771 @@
       const Int_t aidx    = (*fGeom)[pixid].GetAidx();
 
-      FinalizePedestals(*fSignal, ped,pix,aidx);
+      FinalizePedestals(ped,pix,aidx);
 
       if (FinalizeCharges(pix,bad,"pixel  "))

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h

@@ -80 +80 @@
   Int_t   fNumInnerFFactorMethodUsed;          // Number of inner pixels used for F-Factor Method calibration
 
-  TString fOutputPath;                         // Path to the output file
-  TString fOutputFile;                         // Name of the output file  
   TString fNamePedestalCam;                    // Name of the 'MPedestalCam' container
 
@@ -219 +217 @@
   void SetExternalNumPhesRelVar( const Float_t f=0.                       ) { fExternalNumPhesRelVar = f; }  
   void SetNamePedestalCam      ( const char *name=fgNamePedestalCam.Data()) { fNamePedestalCam    = name; }
-  void SetOutputPath           ( const TString path="."                   );
-  void SetOutputFile           ( const TString file="ChargeCalibStat.txt" );
   void SetPheErrLowerLimit     ( const Float_t f=fgPheErrLowerLimit       ) { fPheErrLowerLimit  = f;    }
   void SetPheErrUpperLimit     ( const Float_t f=fgPheErrUpperLimit       ) { fPheErrUpperLimit  = f;    }    
   void SetPulserColor          ( const MCalibrationCam::PulserColor_t col ) { fPulserColor       = col;  }
   
-  ClassDef(MCalibrationChargeCalc, 4)   // Task calculating Calibration Containers and Quantum Efficiencies
+  ClassDef(MCalibrationChargeCalc, 5)   // Task calculating Calibration Containers and Quantum Efficiencies
 };
 

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -43 +43 @@
 //  + Byte_t fCheckFlags; // Bit-field to hold the possible check flags
 //
+// ClassVersionb 3:
+//  -  TString fOutputPath;                           //  Path to the output file
+//  -  TString fOutputFile;                           //  Name of the output file
+//
 //
 //  Input Containers:
@@ -89 +93 @@
 // Initializes:
 // - fRelTimeResolutionLimit to fgRelTimeResolutionimit
-// - fOutputPath        to "."
-// - fOutputFile        to "TimeCalibStat.txt"
 //
 // Calls:
@@ -108 +110 @@
 
   SetRelTimeResolutionLimit();
-  SetOutputPath();
-  SetOutputFile("");
 
   Clear();
@@ -249 +249 @@
 
   //
-  // Re-direct the output to an ascii-file from now on:
-  //
-  MLog *asciilog = fOutputFile.IsNull() ? 0 : new MLog;
-  if (asciilog)
-  {
-      asciilog->SetOutputFile(GetOutputFile(),kTRUE);
-      SetLogStream(asciilog);
-  }
-
-  //
   // Finalize calibration statistics
   //
@@ -282 +272 @@
   PrintUncalibrated(MBadPixelsPix::kRelTimeNotFitted,     
                     "Pixels with unsuccesful Gauss fit to the times:");
-
-  if (asciilog)
-  {
-      SetLogStream(&gLog);
-      delete asciilog;
-  }
 
   return kTRUE;
@@ -534 +518 @@
 // --------------------------------------------------------------------------
 //
-// Set the path for output file
-// 
-void MCalibrationRelTimeCalc::SetOutputPath(TString path)
-{
-    fOutputPath = path;
-    if (fOutputPath.EndsWith("/"))
-        fOutputPath = fOutputPath(0, fOutputPath.Length()-1);
-}
-
-// --------------------------------------------------------------------------
-//
-// Get the output file
-// 
-const char* MCalibrationRelTimeCalc::GetOutputFile()
-{
-    return Form("%s/%s", (const char*)fOutputPath, (const char*)fOutputFile);
-}
-
-
-// --------------------------------------------------------------------------
-//
 // MCalibrationRelTimeCam.CheckFitResults: Yes
 // MCalibrationRelTimeCam.CheckDeviatingBehavior: Yes

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.h

@@ -33 +33 @@
   // Variables
   Float_t fRelTimeResolutionLimit;               //  Limit acceptance rel. time resolution (in FADC slices)
-  TString fOutputPath;                           //  Path to the output file
-  TString fOutputFile;                           //  Name of the output file  
   
   // Pointers
@@ -95 +93 @@
 
   // Setter
-  void SetOutputPath            ( TString path="."                         );
-  void SetOutputFile            ( TString file="TimeCalibStat.txt"         ) { fOutputFile          = file; }
   void SetRelTimeResolutionLimit( const Float_t f=fgRelTimeResolutionLimit ) { fRelTimeResolutionLimit = f; }
 
@@ -106 +102 @@
   void SetDebug(const Bool_t b=kTRUE)                  { b ? SETBIT(fFlags, kDebug) : CLRBIT(fFlags, kDebug); }
 
-  ClassDef(MCalibrationRelTimeCalc, 2)   // Task finalizing the relative time Calibration
+  ClassDef(MCalibrationRelTimeCalc, 3)   // Task finalizing the relative time Calibration
 };