Changeset 5515


Ignore:
Timestamp:
11/30/04 13:48:00 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r5512 r5515  
    2626     - InitArrays: added missing return statement
    2727
    28 
    29 
    3028 2004/11/30: Markus Gaug
    3129
     
    3937     - updated to new version of MPedCalcPedRun (only important for
    4038       intensity calibration)
    41 
     39     
     40   * msignal/MExtractTimeAndCharge.cc
     41     - fixed bug for very high saturating signals setting the low-gain
     42       range wrong.
     43
     44   * mcalib/MCalibrationChargeCalc.[h,cc]
     45     - added variable containing the name of the requested MPedestalCam
    4246
    4347
  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

    r5413 r5515  
    1 
    21/* ======================================================================== *\
    32!
     
    239238const Float_t MCalibrationChargeCalc::fgPheErrLimit            = 4.5;
    240239const Float_t MCalibrationChargeCalc::fgFFactorErrLimit        = 4.5;
     240const TString MCalibrationChargeCalc::fgNamePedestalCam = "MPedestalCam";
    241241// --------------------------------------------------------------------------
    242242//
     
    258258// - fLambdaCheckLimit  to fgLambdaCheckLimit
    259259// - fLambdaErrLimit    to fgLambdaErrLimit
     260// - fNamePedestalCam   to fgNamePedestalCam
    260261// - fPheErrLimit       to fgPheErrLimit 
    261262// - fPulserColor       to MCalibrationCam::kCT1
     
    287288  SetLambdaCheckLimit  ();
    288289  SetLambdaErrLimit    ();
     290  SetNamePedestalCam   ();
    289291  SetPheErrLimit       ();
    290292  SetOutputPath        ();
     
    363365  // Containers that have to be there.
    364366  //
    365   fPedestals = (MPedestalCam*)pList->FindObject("MPedestalCam");
     367  fPedestals = (MPedestalCam*)pList->FindObject("MPedestalCam", AddSerialNumber(fNamePedestalCam.Data()));
    366368  if (!fPedestals)
    367369    {
    368       *fLog << err << "MPedestalCam not found... aborting" << endl;
     370      *fLog << err << fNamePedestalCam.Data() << " not found... aborting" << endl;
    369371      return kFALSE;
    370372    }
  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h

    r5133 r5515  
    5858  static const Float_t fgFFactorErrLimit;      //! Default for fFFactorErrLimit    (now set to: 4.5)
    5959 
     60  static const TString fgNamePedestalCam;      //! "MPedestalCam"
     61
    6062  // Variables
    6163  Float_t fChargeLimit;                        // Limit acceptance mean charge  (in units of PedRMS)
     
    8385  TString fOutputPath;                         // Path to the output file
    8486  TString fOutputFile;                         // Name of the output file 
     87  TString fNamePedestalCam;                    // Name of the 'MPedestalCam' container
    8588 
    8689  // Pointers
     
    116119
    117120  // functions
    118   const char* GetOutputFile();
    119121  void   FinalizePedestals       ( const MPedestalPix    &ped, MCalibrationChargePix &cal, const Int_t aidx );
    120122  Bool_t FinalizeCharges         ( MCalibrationChargePix &cal, MBadPixelsPix &bad, const char* what);
     
    129131  void   FinalizeUnsuitablePixels();
    130132
    131   void   PrintUncalibrated( MBadPixelsPix::UncalibratedType_t typ, const char *text) const;
     133  const char* GetOutputFile();
    132134
    133135  // Query checks
     
    138140  Bool_t IsCheckOscillations     () const { return TESTBIT(fCheckFlags,kCheckOscillations);      } 
    139141 
     142  void   PrintUncalibrated( MBadPixelsPix::UncalibratedType_t typ, const char *text) const;
     143
    140144  // Global fit results
    141145  void   SetPheFitOK          ( const Int_t aidx, const Bool_t b=kTRUE ) {
     
    197201  void SetLambdaErrLimit    ( const Float_t f=fgLambdaErrLimit         ) { fLambdaErrLimit    = f;     }
    198202  void SetLambdaCheckLimit  ( const Float_t f=fgLambdaCheckLimit       ) { fLambdaCheckLimit  = f;     }
     203  void SetNamePedestalCam   ( const char *name=fgNamePedestalCam.Data()) { fNamePedestalCam   = name;  }
    199204  void SetOutputPath        ( TString path="."                   );
    200205  void SetOutputFile        ( TString file="ChargeCalibStat.txt" );
Note: See TracChangeset for help on using the changeset viewer.