Changeset 8142 for trunk


Ignore:
Timestamp:
10/20/06 19:50:35 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mcalib
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

    r8141 r8142  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.168 2006-10-20 18:49:53 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.169 2006-10-20 18:50:35 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    771771      const Int_t aidx    = (*fGeom)[pixid].GetAidx();
    772772
    773       FinalizePedestals(*fSignal, ped,pix,aidx);
     773      FinalizePedestals(ped,pix,aidx);
    774774
    775775      if (FinalizeCharges(pix,bad,"pixel  "))

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h

    r7288 r8142  
    8080  Int_t   fNumInnerFFactorMethodUsed;          // Number of inner pixels used for F-Factor Method calibration
    8181
    82   TString fOutputPath;                         // Path to the output file
    83   TString fOutputFile;                         // Name of the output file 
    8482  TString fNamePedestalCam;                    // Name of the 'MPedestalCam' container
    8583
    … …  
    219217  void SetExternalNumPhesRelVar( const Float_t f=0.                       ) { fExternalNumPhesRelVar = f; } 
    220218  void SetNamePedestalCam      ( const char *name=fgNamePedestalCam.Data()) { fNamePedestalCam    = name; }
    221   void SetOutputPath           ( const TString path="."                   );
    222   void SetOutputFile           ( const TString file="ChargeCalibStat.txt" );
    223219  void SetPheErrLowerLimit     ( const Float_t f=fgPheErrLowerLimit       ) { fPheErrLowerLimit  = f;    }
    224220  void SetPheErrUpperLimit     ( const Float_t f=fgPheErrUpperLimit       ) { fPheErrUpperLimit  = f;    }   
    225221  void SetPulserColor          ( const MCalibrationCam::PulserColor_t col ) { fPulserColor       = col;  }
    226222 
    227   ClassDef(MCalibrationChargeCalc, 4)   // Task calculating Calibration Containers and Quantum Efficiencies
     223  ClassDef(MCalibrationChargeCalc, 5)   // Task calculating Calibration Containers and Quantum Efficiencies
    228224};
    229225

  • trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

    r8015 r8142  
    4343//  + Byte_t fCheckFlags; // Bit-field to hold the possible check flags
    4444//
     45// ClassVersionb 3:
     46//  -  TString fOutputPath;                           //  Path to the output file
     47//  -  TString fOutputFile;                           //  Name of the output file
     48//
    4549//
    4650//  Input Containers:
    … …  
    8993// Initializes:
    9094// - fRelTimeResolutionLimit to fgRelTimeResolutionimit
    91 // - fOutputPath        to "."
    92 // - fOutputFile        to "TimeCalibStat.txt"
    9395//
    9496// Calls:
    … …  
    108110
    109111  SetRelTimeResolutionLimit();
    110   SetOutputPath();
    111   SetOutputFile("");
    112112
    113113  Clear();
    … …  
    249249
    250250  //
    251   // Re-direct the output to an ascii-file from now on:
    252   //
    253   MLog *asciilog = fOutputFile.IsNull() ? 0 : new MLog;
    254   if (asciilog)
    255   {
    256       asciilog->SetOutputFile(GetOutputFile(),kTRUE);
    257       SetLogStream(asciilog);
    258   }
    259 
    260   //
    261251  // Finalize calibration statistics
    262252  //
    … …  
    282272  PrintUncalibrated(MBadPixelsPix::kRelTimeNotFitted,     
    283273                    "Pixels with unsuccesful Gauss fit to the times:");
    284 
    285   if (asciilog)
    286   {
    287       SetLogStream(&gLog);
    288       delete asciilog;
    289   }
    290274
    291275  return kTRUE;
    … …  
    534518// --------------------------------------------------------------------------
    535519//
    536 // Set the path for output file
    537 //
    538 void MCalibrationRelTimeCalc::SetOutputPath(TString path)
    539 {
    540     fOutputPath = path;
    541     if (fOutputPath.EndsWith("/"))
    542         fOutputPath = fOutputPath(0, fOutputPath.Length()-1);
    543 }
    544 
    545 // --------------------------------------------------------------------------
    546 //
    547 // Get the output file
    548 //
    549 const char* MCalibrationRelTimeCalc::GetOutputFile()
    550 {
    551     return Form("%s/%s", (const char*)fOutputPath, (const char*)fOutputFile);
    552 }
    553 
    554 
    555 // --------------------------------------------------------------------------
    556 //
    557520// MCalibrationRelTimeCam.CheckFitResults: Yes
    558521// MCalibrationRelTimeCam.CheckDeviatingBehavior: Yes

  • trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.h

    r7366 r8142  
    3333  // Variables
    3434  Float_t fRelTimeResolutionLimit;               //  Limit acceptance rel. time resolution (in FADC slices)
    35   TString fOutputPath;                           //  Path to the output file
    36   TString fOutputFile;                           //  Name of the output file 
    3735 
    3836  // Pointers
    … …  
    9593
    9694  // Setter
    97   void SetOutputPath            ( TString path="."                         );
    98   void SetOutputFile            ( TString file="TimeCalibStat.txt"         ) { fOutputFile          = file; }
    9995  void SetRelTimeResolutionLimit( const Float_t f=fgRelTimeResolutionLimit ) { fRelTimeResolutionLimit = f; }
    10096
    … …  
    106102  void SetDebug(const Bool_t b=kTRUE)                  { b ? SETBIT(fFlags, kDebug) : CLRBIT(fFlags, kDebug); }
    107103
    108   ClassDef(MCalibrationRelTimeCalc, 2)   // Task finalizing the relative time Calibration
     104  ClassDef(MCalibrationRelTimeCalc, 3)   // Task finalizing the relative time Calibration
    109105};
    110106
Note: See TracChangeset for help on using the changeset viewer.