Changeset 8141 for trunk

Timestamp:

10/20/06 19:49:53 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeCalc.cc (modified) (7 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -35 +35 @@
      - if a new cam is added to the intensity cam list the old
        cam is deleted now which fixes the bigges memory leak in callisto
+
+   * mcalib/MCalibrationChargeCalc.[h,cc], 
+     mcalib/MCalibrationRelTimeCalc.[h,cc]:
+     - removed fOutputPath and fOutputFile
+
+   * mjobs/MJCalibration.cc, mjobs/MJCalibrateSignal.cc:
+     - removed reference to SetOutputFile
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.167 2006-10-19 13:59:08 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.168 2006-10-20 18:49:53 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -190 +190 @@
 //   + Bool_t  fUseExtractorRes;  // Include extractor resolution in F-Factor method
 //
-//  ClassVersion 3:
+//  ClassVersion 4:
 //   +  Float_t fUnsuitablesLimit;                   // Limit for relative number of unsuitable pixels
 //   +  Float_t fUnreliablesLimit;                   // Limit for relative number of unreliable pixels
 //   +  Float_t fExternalNumPhes;                    // External mean number of photo-electrons set from outside
 //   +  Float_t fExternalNumPhesRelVar;              // External rel. var. number of photo-electrons set from outside  
+//
+//  ClassVersion 5:
+//   -  TString fOutputPath
+//   -  TString fOutputFile
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -317 +321 @@
   SetLambdaErrLimit    ();
   SetNamePedestalCam   ();
-  SetOutputPath        ();
-  SetOutputFile        ();
   SetPheErrLowerLimit  ();
   SetPheErrUpperLimit  ();
@@ -769 +771 @@
       const Int_t aidx    = (*fGeom)[pixid].GetAidx();
 
-      FinalizePedestals(ped,pix,aidx);
+      FinalizePedestals(*fSignal, ped,pix,aidx);
 
       if (FinalizeCharges(pix,bad,"pixel  "))
@@ -870 +872 @@
   // Re-direct the output to an ascii-file from now on:
   //
-  MLog *oldlog = fLog;
-  MLog asciilog;
-  if (!fOutputFile.IsNull())
-  {
-      asciilog.SetOutputFile(GetOutputFile(),kTRUE);
-      SetLogStream(&asciilog);
-  }
-
   *fLog << inf << endl;
   *fLog << GetDescriptor() << ": Fatal errors statistics:" << endl;  
@@ -922 +916 @@
                     "Deviating F-Factor:                     ");
 
-  if (!fOutputFile.IsNull())
-      SetLogStream(oldlog);
-
   chargecam->SetReadyToSave();
   qecam    ->SetReadyToSave();
@@ -2287 +2278 @@
 // --------------------------------------------------------------------------
 //
-// Set the path for output file
-// 
-void MCalibrationChargeCalc::SetOutputPath(TString path)
-{
-  fOutputPath = path;
-  if (fOutputPath.EndsWith("/"))
-    fOutputPath = fOutputPath(0, fOutputPath.Length()-1);
-}
-
-// --------------------------------------------------------------------------
-//
-// Set the output file
-// 
-void MCalibrationChargeCalc::SetOutputFile(TString file)
-{ 
-  fOutputFile = file; 
-}
-
-// --------------------------------------------------------------------------
-//
-// Get the output file
-// 
-const char* MCalibrationChargeCalc::GetOutputFile()
-{
-  return Form("%s/%s", (const char*)fOutputPath, (const char*)fOutputFile);
-}
-
-// --------------------------------------------------------------------------
-//
 // Read the environment for the following data members:
 // - fChargeLimit

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -533 +533 @@
     MCalibrationRelTimeCalc recalc;
     MCalibCalcFromPast      pacalc;
-    chcalc.SetOutputFile("");
-    recalc.SetOutputFile("");
 
     pinext.SetPedestals(&pedcamab);

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1841 +1841 @@
     MCalibrationRelTimeCalc  timecalc;
     calcalc.SetExtractor(fExtractor);
-    calcalc.SetOutputFile("");
-    timecalc.SetOutputFile("");
 
     if (IsDebug())