Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 5129) +++ /trunk/MagicSoft/Mars/Changelog (revision 5130) @@ -24,4 +24,10 @@ - added function SetPulserColor which was only available in MCalibrationBlindPix. + + * mcalib/MCalibrationChargeBlindCam.[h,cc] + * mcalib/MCalibrationChargeBlindPix.[h,cc] + * mcalib/Makefile + * mcalib/CalibLinkDef.h + - removed the two classes since obsolete * mcalib/MCalibrationCam.h Index: /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 5129) +++ /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 5130) @@ -37,6 +37,4 @@ #pragma link C++ class MCalibrationBlindCamOneOldStyle+; #pragma link C++ class MCalibrationBlindCamTwoNewStyle+; -#pragma link C++ class MCalibrationChargeBlindCam+; -#pragma link C++ class MCalibrationChargeBlindPix+; #pragma link C++ class MCalibrationChargePINDiode+; Index: unk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindCam.cc (revision 5129) +++ (revision ) @@ -1,149 +1,0 @@ -/* ======================================================================== *\ -! -! * -! * This file is part of MARS, the MAGIC Analysis and Reconstruction -! * Software. It is distributed to you in the hope that it can be a useful -! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. -! * It is distributed WITHOUT ANY WARRANTY. -! * -! * Permission to use, copy, modify and distribute this software and its -! * documentation for any purpose is hereby granted without fee, -! * provided that the above copyright notice appear in all copies and -! * that both that copyright notice and this permission notice appear -! * in supporting documentation. It is provided "as is" without express -! * or implied warranty. -! * -! -! -! Author(s): Markus Gaug 07/2004 -! -! Copyright: MAGIC Software Development, 2000-2004 -! -! -\* ======================================================================== */ - -///////////////////////////////////////////////////////////////////////////// -// -// MCalibrationChargeBlindCam -// -// Base class for Blind Pixels Calibration results. Derived classes intialize -// the actual values of the MCalibrationBlindPix's. -// -// Contains TClonesArrays for the following objects: -// - fBlindPixels: Array of classes derived from MCalibrationChargeBlindPix, one entry -// per blind pixel. -// -// All TClonesArrays have to enlarged by the corresponding calls to (e.g. in MGeomApply): -// - InitSize() -// -// See also: MCalibrationChargeBlindCamOneOldStyle -// -///////////////////////////////////////////////////////////////////////////// -#include "MCalibrationChargeBlindCam.h" -#include "MCalibrationChargeBlindPix.h" - -#include "MParContainer.h" - -ClassImp(MCalibrationChargeBlindCam); - -using namespace std; -// -------------------------------------------------------------------------- -// -// Default constructor. -// -// Initializes: -// - fPulserColor to kNONE -// -// Creates a TClonesArray of MCalibrationChargeBlindPix containers for the TClonesArray's: -// - fBlindPixels -// all initialized to 1 entry -// -// Later, a call to InitSize() -// has to be performed in order to get the dimension correctly. -// -MCalibrationChargeBlindCam::MCalibrationChargeBlindCam(UInt_t nblind,const char *name, const char *title) - : fNumBlindPixels(nblind), - fPulserColor(MCalibrationCam::kNONE), - fBlindPixels(nblind) -{ - - fName = name ? name : "MCalibrationChargeBlindCam"; - fTitle = title ? title : "Calibration Information of blinded pixels in camera"; - - // - // make sure that the destructor delete all contained objects - // - fBlindPixels.SetOwner(); - - for (UInt_t i=0; i(fBlindPixels.UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th pixel (pixel number) -// -const MCalibrationChargeBlindPix &MCalibrationChargeBlindCam::operator[](UInt_t i) const -{ - return *static_cast(fBlindPixels.UncheckedAt(i)); -} - - -// -------------------------------------------------------------------------- -// -// Print the results of the blind pixels -// -void MCalibrationChargeBlindCam::Print(Option_t *o) const -{ - - fBlindPixels.Print(); -} - -// -------------------------------------------------------------------------- -// -// Set color to this class and to the MCalibrationBlindPix's -// -void MCalibrationChargeBlindCam::SetColor ( const MCalibrationCam::PulserColor_t col ) -{ - - fPulserColor = col; - fBlindPixels.ForEach(MCalibrationChargeBlindPix, SetColor)(col); - -} Index: unk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindCam.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindCam.h (revision 5129) +++ (revision ) @@ -1,46 +1,0 @@ -#ifndef MARS_MCalibrationChargeBlindCam -#define MARS_MCalibrationChargeBlindCam - -#ifndef ROOT_TObjArray -#include -#endif - -#ifndef MARS_MCalibrationCam -#include "MCalibrationCam.h" -#endif - -class MCalibrationChargeBlindPix; -class MCalibrationChargeBlindCam : public MParContainer -{ -private: - - UInt_t fNumBlindPixels; // Number of blind pixels - - MCalibrationCam::PulserColor_t fPulserColor; // Colour of the pulsed LEDs - - TObjArray fBlindPixels; // Array of MCalibrationChargeBlindPix - -public: - - MCalibrationChargeBlindCam(UInt_t nblind=0,const char *name=NULL, const char *title=NULL); - - void Clear ( Option_t *o="" ); - void Copy ( TObject& obj ) const; - - // Getters - UInt_t GetNumBlindPixels() const { return fNumBlindPixels; } - MCalibrationCam::PulserColor_t GetColor() const { return fPulserColor; } - - MCalibrationChargeBlindPix &operator[] ( UInt_t i ); - const MCalibrationChargeBlindPix &operator[] ( UInt_t i ) const; - - // Setters - void SetColor ( const MCalibrationCam::PulserColor_t col ); - - // Prints - void Print(Option_t *o="") const; - - ClassDef(MCalibrationChargeBlindCam, 2) // Container Blind Pixel Calibration Results Camera -}; - -#endif Index: unk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.cc (revision 5129) +++ (revision ) @@ -1,528 +1,0 @@ -/* ======================================================================== *\ -! -! * -! * This file is part of MARS, the MAGIC Analysis and Reconstruction -! * Software. It is distributed to you in the hope that it can be a useful -! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. -! * It is distributed WITHOUT ANY WARRANTY. -! * -! * Permission to use, copy, modify and distribute this software and its -! * documentation for any purpose is hereby granted without fee, -! * provided that the above copyright notice appear in all copies and -! * that both that copyright notice and this permission notice appear -! * in supporting documentation. It is provided "as is" without express -! * or implied warranty. -! * -! -! -! Author(s): Markus Gaug 02/2004 -! -! Copyright: MAGIC Software Development, 2000-2004 -! -! -\* ======================================================================== */ - -///////////////////////////////////////////////////////////////////////////// -// -// MCalibrationChargeBlindPix -// -// Storage container of the fit results of the Blind Pixel signal -// (from MHCalibrationChargeBlindPix). -// -// The Flux is calculated in photons per mm^2 in the camera plane. -// -// Currently, the following numbers are implemented: -// - fArea: 100 mm^2 -// - Average QE of Blind Pixel: -// fQEGreen: 0.154 -// fQEBlue : 0.226 -// fQEUV : 0.247 -// fQECT1 : 0.247 -// - Average QE Error of Blind Pixel: -// fQEGreenErr: 0.015; -// fQEBlueErr : 0.02; -// fQEUVErr : 0.02; -// fQECT1Err : 0.02; -// - Attenuation factor Blind Pixel: -// fAttGreen : 1.97; -// fAttBlue : 1.96; -// fAttUV : 1.95; -// fAttCT1 : 1.95; -// -// -///////////////////////////////////////////////////////////////////////////// -#include "MCalibrationChargeBlindPix.h" - -#include - -#include "MLog.h" -#include "MLogManip.h" - -ClassImp(MCalibrationChargeBlindPix); - -using namespace std; -const Float_t MCalibrationChargeBlindPix::fgArea = 100; -const Float_t MCalibrationChargeBlindPix::fgAttGreen = 1.97; -const Float_t MCalibrationChargeBlindPix::fgAttBlue = 1.96; -const Float_t MCalibrationChargeBlindPix::fgAttUV = 1.95; -const Float_t MCalibrationChargeBlindPix::fgAttCT1 = 1.95; -const Float_t MCalibrationChargeBlindPix::fgAttErr = 0.01; -const Float_t MCalibrationChargeBlindPix::fgQEGreen = 0.154; -const Float_t MCalibrationChargeBlindPix::fgQEBlue = 0.226; -const Float_t MCalibrationChargeBlindPix::fgQEUV = 0.247; -const Float_t MCalibrationChargeBlindPix::fgQECT1 = 0.247; -const Float_t MCalibrationChargeBlindPix::fgQEErrGreen = 0.005; -const Float_t MCalibrationChargeBlindPix::fgQEErrBlue = 0.007; -const Float_t MCalibrationChargeBlindPix::fgQEErrUV = 0.01; -const Float_t MCalibrationChargeBlindPix::fgQEErrCT1 = 0.01; -const Float_t MCalibrationChargeBlindPix::fgCollEffGreen = 0.99; -const Float_t MCalibrationChargeBlindPix::fgCollEffBlue = 0.93; -const Float_t MCalibrationChargeBlindPix::fgCollEffUV = 0.90; -const Float_t MCalibrationChargeBlindPix::fgCollEffCT1 = 0.90; -const Float_t MCalibrationChargeBlindPix::fgCollEffErr = 0.05; -// -------------------------------------------------------------------------- -// -// Default Constructor. -// -// Calls: -// - Clear() -// -// For backward-compatibility reasons, quantum eff., coll. eff. and att. -// are intialized from the static members. This should, however, be -// overwritten by a class deriving from MCalibrationChargeBlindCam. -// -MCalibrationChargeBlindPix::MCalibrationChargeBlindPix(const char *name, const char *title) -{ - - fName = name ? name : "MCalibrationChargeBlindPix"; - fTitle = title ? title : "Container of the fit results of the blind pixel"; - - Clear(); - - fArea = fgArea; - - fAtt .Set( MCalibrationCam::gkNumPulserColors ); - fAttErr .Set( MCalibrationCam::gkNumPulserColors ); - fQE .Set( MCalibrationCam::gkNumPulserColors ); - fQEErr .Set( MCalibrationCam::gkNumPulserColors ); - fCollEff .Set( MCalibrationCam::gkNumPulserColors ); - fCollEffErr.Set( MCalibrationCam::gkNumPulserColors ); - - SetAtt ( fgAttGreen, MCalibrationCam::kGREEN ); - SetAtt ( fgAttBlue, MCalibrationCam::kBLUE ); - SetAtt ( fgAttUV , MCalibrationCam::kUV ); - SetAtt ( fgAttCT1 , MCalibrationCam::kCT1 ); - - SetAttErr ( fgAttErr , MCalibrationCam::kGREEN ); - SetAttErr ( fgAttErr , MCalibrationCam::kBLUE ); - SetAttErr ( fgAttErr , MCalibrationCam::kUV ); - SetAttErr ( fgAttErr , MCalibrationCam::kCT1 ); - - SetQE ( fgQEGreen, MCalibrationCam::kGREEN ); - SetQE ( fgQEBlue, MCalibrationCam::kBLUE ); - SetQE ( fgQEUV , MCalibrationCam::kUV ); - SetQE ( fgQECT1 , MCalibrationCam::kCT1 ); - - SetQEErr ( fgQEErrGreen, MCalibrationCam::kGREEN ); - SetQEErr ( fgQEErrBlue, MCalibrationCam::kBLUE ); - SetQEErr ( fgQEErrUV , MCalibrationCam::kUV ); - SetQEErr ( fgQEErrCT1 , MCalibrationCam::kCT1 ); - - SetCollEff ( fgCollEffGreen, MCalibrationCam::kGREEN ); - SetCollEff ( fgCollEffBlue, MCalibrationCam::kBLUE ); - SetCollEff ( fgCollEffUV , MCalibrationCam::kUV ); - SetCollEff ( fgCollEffCT1 , MCalibrationCam::kCT1 ); - - SetCollEffErr ( fgCollEffErr, MCalibrationCam::kGREEN ); - SetCollEffErr ( fgCollEffErr, MCalibrationCam::kBLUE ); - SetCollEffErr ( fgCollEffErr, MCalibrationCam::kUV ); - SetCollEffErr ( fgCollEffErr, MCalibrationCam::kCT1 ); - -} - -// ------------------------------------------------------------------------ -// -// Sets: -// - all flags to kFALSE -// - all variables to -1. -// - the fColor to MCalibrationCam::kNONE -// -// Calls: -// - MCalibrationChargePix::Clear() -// -void MCalibrationChargeBlindPix::Clear(Option_t *o) -{ - - fFluxInsidePlexiglass = -1.; - fFluxInsidePlexiglassVar = -1.; - fLambda = -1.; - fLambdaCheck = -1.; - fLambdaVar = -1.; - fMu0 = -1.; - fMu0Err = -1.; - fMu1 = -1.; - fMu1Err = -1.; - fSigma0 = -1.; - fSigma0Err = -1.; - fSigma1 = -1.; - fSigma1Err = -1.; - - SetOscillating ( kFALSE ); - SetExcluded ( kFALSE ); - SetChargeFitValid ( kFALSE ); - SetPedestalFitOK ( kFALSE ); - SetSinglePheFitOK ( kFALSE ); - SetFluxInsidePlexiglassAvailable ( kFALSE ); - - SetColor(MCalibrationCam::kNONE); - - MCalibrationPix::Clear(); -} - -void MCalibrationChargeBlindPix::SetFluxInsidePlexiglassAvailable( const Bool_t b) -{ - b ? SETBIT(fFlags,kFluxInsidePlexiglassAvailable) : CLRBIT(fFlags,kFluxInsidePlexiglassAvailable); -} - - -// -------------------------------------------------------------------------- -// -// Set the Oscillating Bit from outside -// -void MCalibrationChargeBlindPix::SetOscillating( const Bool_t b) -{ - b ? SETBIT(fFlags,kOscillating) : CLRBIT(fFlags,kOscillating); -} - -// ----------------------------------------------------- -// -// copy 'constructor' -// -void MCalibrationChargeBlindPix::Copy(TObject& object) const -{ - - MCalibrationChargeBlindPix &pix = (MCalibrationChargeBlindPix&)object; - - // - // Copy the data members - // - pix.fArea = fArea; - pix.fAtt = fAtt; - pix.fAttErr = fAttErr; - pix.fQE = fQE; - pix.fQEErr = fQEErr; - pix.fCollEff = fCollEff; - pix.fCollEffErr = fCollEffErr; - - pix.fLambda = fLambda; - pix.fLambdaCheck = fLambdaCheck; - pix.fLambdaCheckErr = fLambdaCheckErr; - pix.fLambdaVar = fLambdaVar; - pix.fFluxInsidePlexiglass = fFluxInsidePlexiglass; - pix.fFluxInsidePlexiglassVar = fFluxInsidePlexiglassVar; - pix.fMu0 = fMu0; - pix.fMu0Err = fMu0Err; - pix.fMu1 = fMu1; - pix.fMu1Err = fMu1Err; - pix.fSigma0 = fSigma0; - pix.fSigma0Err = fSigma0Err; - pix.fSigma1 = fSigma1; - pix.fSigma1Err = fSigma1Err; - - pix.fColor = fColor; - pix.fPixId = fPixId; - pix.fFlags = fFlags; - -} - - -// -------------------------------------------------------------------------- -// -// Set the ChargeFitValid Bit from outside -// -void MCalibrationChargeBlindPix::SetChargeFitValid( const Bool_t b) -{ - b ? SETBIT(fFlags,kChargeFitValid) : CLRBIT(fFlags,kChargeFitValid); -} - -// -------------------------------------------------------------------------- -// -// Set the PedestalFitValid Bit from outside -// -void MCalibrationChargeBlindPix::SetPedestalFitOK( const Bool_t b) -{ - b ? SETBIT(fFlags,kPedestalFitOK) : CLRBIT(fFlags,kPedestalFitOK); -} - -// -------------------------------------------------------------------------- -// -// Set the SinglePheFitValid Bit from outside -// -void MCalibrationChargeBlindPix::SetSinglePheFitOK( const Bool_t b) -{ - b ? SETBIT(fFlags,kSinglePheFitOK) : CLRBIT(fFlags,kSinglePheFitOK); -} - -// -------------------------------------------------------------------------- -// -// Return -1 if fFluxInsidePlexiglassVar is smaller than 0. -// Return square root of fFluxInsidePlexiglassVar -// -const Float_t MCalibrationChargeBlindPix::GetFluxInsidePlexiglassErr() const -{ - if (fFluxInsidePlexiglassVar < 0.) - return -1.; - - return TMath::Sqrt(fFluxInsidePlexiglassVar); -} - -// -------------------------------------------------------------------------- -// -// Return -1 if fFluxInsidePlexiglassVar is smaller than 0. -// Return -1 if fFluxInsidePlexiglass is 0. -// Return fFluxInsidePlexiglassVar / fFluxInsidePlexiglass^2 -// -const Float_t MCalibrationChargeBlindPix::GetFluxInsidePlexiglassRelVar() const -{ - if (fFluxInsidePlexiglassVar < 0.) - return -1.; - - if (fFluxInsidePlexiglass == 0.) - return -1.; - - return fFluxInsidePlexiglassVar / (fFluxInsidePlexiglass * fFluxInsidePlexiglass) ; -} - -// -------------------------------------------------------------------------- -// -// Return -1 if fLambdaVar is smaller than 0. -// Return square root of fLambdaVar -// -const Float_t MCalibrationChargeBlindPix::GetLambdaErr() const -{ - if (fLambdaVar < 0.) - return -1.; - - return TMath::Sqrt(fLambdaVar); -} - -// -------------------------------------------------------------------------- -// -// Return -1 if fLambdaVar is smaller than 0. -// Return -1 if fLambda is 0. -// Return fLambdaVar / (fLambda * fLambda ) -// -const Float_t MCalibrationChargeBlindPix::GetLambdaRelVar() const -{ - if (fLambdaVar < 0.) - return -1.; - - if (fLambda == 0.) - return -1.; - - return fLambdaVar / fLambda / fLambda ; -} - -// -------------------------------------------------------------------------- -// -// Return TMath::Power(10,fAtt[fColor]) -// -const Float_t MCalibrationChargeBlindPix::GetAtt() const -{ - return TMath::Power(10,fAtt[fColor]); -} - -// -------------------------------------------------------------------------- -// -// Return -1 if fAttErr[fColor] is smaller than 0. -// Error of TMath::Power(10,fAtt[fColor]) = TMath::Power(10,fAtt[fColor])*ln(10.)*fAttErr[fColor] -// Return fAttErr^2 / (fAtt^2 ) -// -const Float_t MCalibrationChargeBlindPix::GetAttRelVar() const -{ - - const Float_t err = fAttErr[fColor]; - - if (err < 0.) - return -1.; - - return err*err*2.3; -} - -// -------------------------------------------------------------------------- -// -// Return fQE[fColor] -// -const Float_t MCalibrationChargeBlindPix::GetQE() const -{ - return fQE[fColor]; -} - -// -------------------------------------------------------------------------- -// -// Return -1 if fQEErr[fColor] is smaller than 0. -// Return fQEErr^2 / (fQE^2 ) -// -const Float_t MCalibrationChargeBlindPix::GetQERelVar() const -{ - - if (fQEErr[fColor] < 0.) - return -1.; - - return fQEErr[fColor]* fQEErr[fColor] / GetQE() / GetQE(); -} - -// -------------------------------------------------------------------------- -// -// Return fCollEff[fColor] -// -const Float_t MCalibrationChargeBlindPix::GetCollEff() const -{ - return fCollEff[fColor]; -} - -// -------------------------------------------------------------------------- -// -// Return -1 if fCollEffErr[fColor] is smaller than 0. -// Return fCollEffErr^2 / (fCollEff^2 ) -// -const Float_t MCalibrationChargeBlindPix::GetCollEffRelVar() const -{ - - if (fCollEffErr[fColor] < 0.) - return -1.; - - return fCollEffErr[fColor]* fCollEffErr[fColor] / GetCollEff() / GetCollEff(); -} - -// -------------------------------------------------------------------------- -// -// Test bit kChargeFitValid -// -const Bool_t MCalibrationChargeBlindPix::IsChargeFitValid() const -{ - return TESTBIT(fFlags,kChargeFitValid); -} - -// -------------------------------------------------------------------------- -// -// Test bit kOscillating -// -const Bool_t MCalibrationChargeBlindPix::IsOscillating() const -{ - return TESTBIT(fFlags,kOscillating); -} - -// -------------------------------------------------------------------------- -// -// Test bit kPedestalFitValid -// -const Bool_t MCalibrationChargeBlindPix::IsPedestalFitOK() const -{ - return TESTBIT(fFlags,kPedestalFitOK); -} - -// -------------------------------------------------------------------------- -// -// Test bit kSinglePheFitValid -// -const Bool_t MCalibrationChargeBlindPix::IsSinglePheFitOK() const -{ - return TESTBIT(fFlags,kSinglePheFitOK); -} - -// -------------------------------------------------------------------------- -// -// Test bit kFluxInsidePlexiglassAvailable -// -const Bool_t MCalibrationChargeBlindPix::IsFluxInsidePlexiglassAvailable() const -{ - return TESTBIT(fFlags,kFluxInsidePlexiglassAvailable); -} - - -// -------------------------------------------------------------------------- -// -// Return kFALSE if IsChargeFitValid() is kFALSE -// -// Calculate fFluxInsidePlexiglass with the formula: -// - fFluxInsidePlexiglass = fLambda -// / GetCollEff() -// / GetQE() -// * GetAtt() -// / fArea -// - fFluxInsidePlexiglassVar = sqrt( fLambdaVar / ( fLambda * fLambda ) -// + GetQERelVar() -// + GetCollEffRelVar() -// + GetAttRelVar() -// ) * fFluxInsidePlexiglass * * fFluxInsidePlexiglass -// -// If the fFluxInsidePlexiglass is smaller than 0., return kFALSE -// If the Variance is smaller than 0., return kFALSE -// -// SetFluxInsidePlexiglassAvailable() and return kTRUE -// -Bool_t MCalibrationChargeBlindPix::CalcFluxInsidePlexiglass() -{ - - if (IsChargeFitValid()) - return kFALSE; - - - // - // Start calculation of number of photons - // The blind pixel has exactly 100 mm^2 area (with negligible error), - // - fFluxInsidePlexiglass = fLambda / GetQE() * GetAtt() / GetCollEff() / fArea; - - if (fFluxInsidePlexiglass < 0.) - return kFALSE; - - fFluxInsidePlexiglassVar = GetLambdaRelVar() + GetQERelVar() + GetAttRelVar() + GetCollEffRelVar(); - - // - // Finish calculation of errors -> convert from relative variance to absolute variance - // - fFluxInsidePlexiglassVar *= fFluxInsidePlexiglass * fFluxInsidePlexiglass; - - if (fFluxInsidePlexiglassVar < 0.) - return kFALSE; - - SetFluxInsidePlexiglassAvailable(kTRUE); - - *fLog << inf << GetDescriptor() - << ": Blind Pixel Nr. " << fPixId << ": Photon flux [ph/mm^2] inside Plexiglass: " - << Form("%5.3f%s%5.3f",fFluxInsidePlexiglass," +- ",GetFluxInsidePlexiglassErr()) << endl; - - return kTRUE; -} - -void MCalibrationChargeBlindPix::Print(Option_t *opt) const -{ - - *fLog << all << GetDescriptor() - << Form("%s%3i","BlindPixel: ",GetPixId()) - << Form("%s%4.2f%s%4.2f"," Lambda: ",GetLambda(),"+-",GetLambdaErr()) - << Form("%s%4.2f%s%4.2f"," Mu0: ",GetMu0(),"+-",GetMu0Err()) - << Form("%s%4.2f%s%4.2f"," Mu1: ",GetMu1(),"+-",GetMu1Err()) - << Form("%s%4.2f%s%4.2f"," Sigma0: ",GetSigma0(),"+-",GetSigma0Err()) - << Form("%s%4.2f%s%4.2f"," Sigma1: ",GetSigma1(),"+-",GetSigma1Err()) - << endl; - *fLog << all - << " Pedestal Fit OK? :" << IsPedestalFitOK() - << Form("%s%4.2f%s%4.2f"," Lambda (Check): " ,GetLambdaCheck(),"+-",GetLambdaCheckErr()) - << endl; - *fLog << all - << " Flux available? :" << IsFluxInsidePlexiglassAvailable() - << Form("%s%4.2f%s%4.2f"," Flux: " ,GetFluxInsidePlexiglass(),"+-",GetFluxInsidePlexiglassErr()) - << endl; -} - - - - - - - - - Index: unk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.h (revision 5129) +++ (revision ) @@ -1,142 +1,0 @@ -#ifndef MARS_MCalibrationChargeBlindPix -#define MARS_MCalibrationChargeBlindPix - -#ifndef ROOT_TArrayF -#include -#endif - -#ifndef MARS_MCalibrationCam -#include "MCalibrationCam.h" -#endif - -#ifndef MARS_MCalibrationPix -#include "MCalibrationPix.h" -#endif - -class MCalibrationChargeBlindPix : public MCalibrationPix -{ -private: - - static const Float_t fgArea; //! The Blind Pixel area in mm^2 - static const Float_t fgAttGreen; //! Attenuation Filter at 520 nm - static const Float_t fgAttBlue ; //! Attenuation Filter at 460 nm - static const Float_t fgAttUV ; //! Attenuation Filter at 370 nm - static const Float_t fgAttCT1 ; //! Attenuation Filter at 370 nm - static const Float_t fgAttErr; //! Error Att. Filter at all w.l. - static const Float_t fgQEGreen; //! Quantum Efficiency at 520 nm - static const Float_t fgQEBlue ; //! Quantum Efficiency at 460 nm - static const Float_t fgQEUV ; //! Quantum Efficiency at 370 nm - static const Float_t fgQECT1 ; //! Quantum Efficiency at 370 nm - static const Float_t fgQEErrGreen; //! Uncertainty QEUnCoated at 520 nm - static const Float_t fgQEErrBlue; //! Uncertainty QEUnCoated at 460 nm - static const Float_t fgQEErrUV ; //! Uncertainty QEUnCoated at 370 nm - static const Float_t fgQEErrCT1 ; //! Uncertainty QEUnCoated at 370 nmu - static const Float_t fgCollEffGreen; //! Collecttion Efficiency - static const Float_t fgCollEffBlue; //! Collecttion Efficiency - static const Float_t fgCollEffUV; //! Collecttion Efficiency - static const Float_t fgCollEffCT1; //! Collecttion Efficiency - static const Float_t fgCollEffErr; //! Uncertainty Collection Efficiency - - Float_t fArea; // Blind Pixel Area - TArrayF fAtt; // Attenuation filter (per color) - TArrayF fAttErr; // Error attnuation filter (per color) - TArrayF fQE; // Quantum eff. (per color) - TArrayF fQEErr; // Error Quantum eff. (per color) - TArrayF fCollEff; // Coll eff. (per color) - TArrayF fCollEffErr; // Error coll. eff. (per color) - - Float_t fLambda; // Mean Poisson fit - Float_t fLambdaCheck; // Mean Pedestal Check (Gauss) fit - Float_t fLambdaCheckErr; // Error mean pedestal Check fit - Float_t fLambdaVar; // Variance lambda Poisson fit - Float_t fFluxInsidePlexiglass; // Number photons in INNER PIXEL inside the plexiglass - Float_t fFluxInsidePlexiglassVar; // Variance number of photons in INNER PIXEL - Float_t fMu0; // Position pedestal peak - Float_t fMu0Err; // Error pos. pedestal-peak - Float_t fMu1; // Position first photo-electron peak - Float_t fMu1Err; // Error pos. first photo-electon peak - Float_t fSigma0; // Width pedestal peak - Float_t fSigma0Err; // Error width pedestal peak - Float_t fSigma1; // Width first photo-electron peak - Float_t fSigma1Err; // Error width first photo-electron peak - - enum { kOscillating, kPedestalFitOK, kSinglePheFitOK, kChargeFitValid, - kFluxInsidePlexiglassAvailable }; // Possible validity flags - - MCalibrationCam::PulserColor_t fColor; // Colour of the used pulser light - -public: - - MCalibrationChargeBlindPix(const char *name=NULL, const char *title=NULL); - - Bool_t CalcFluxInsidePlexiglass(); - void Clear(Option_t *o=""); - void Copy(TObject& object) const; - - // Getters - const Float_t GetAtt () const; - const Float_t GetAttRelVar () const; - const Float_t GetQE () const; - const Float_t GetQERelVar () const; - const Float_t GetCollEff () const; - const Float_t GetCollEffRelVar() const; - - const MCalibrationCam::PulserColor_t GetColor () const { return fColor; } - const Float_t GetLambda () const { return fLambda; } - const Float_t GetLambdaErr () const; - const Float_t GetLambdaRelVar () const; - const Float_t GetLambdaCheck () const { return fLambdaCheck; } - const Float_t GetLambdaCheckErr () const { return fLambdaCheckErr; } - const Float_t GetFluxInsidePlexiglass () const { return fFluxInsidePlexiglass; } - const Float_t GetFluxInsidePlexiglassErr () const; - const Float_t GetFluxInsidePlexiglassRelVar () const; - const Float_t GetMu0 () const { return fMu0; } - const Float_t GetMu0Err () const { return fMu0Err; } - const Float_t GetMu1 () const { return fMu1; } - const Float_t GetMu1Err () const { return fMu1Err; } - const Float_t GetSigma0 () const { return fSigma0; } - const Float_t GetSigma0Err () const { return fSigma0Err; } - const Float_t GetSigma1 () const { return fSigma1; } - const Float_t GetSigma1Err () const { return fSigma1Err; } - - const Bool_t IsOscillating () const; - const Bool_t IsChargeFitValid () const; - const Bool_t IsPedestalFitOK () const; - const Bool_t IsSinglePheFitOK () const; - const Bool_t IsFluxInsidePlexiglassAvailable () const; - - void Print(Option_t *opt=NULL) const; - - // Setters - void SetArea ( Float_t f ) { fArea = f; } - void SetAtt ( Float_t f, const MCalibrationCam::PulserColor_t col ) { fAtt [col] = f; } - void SetAttErr ( Float_t f, const MCalibrationCam::PulserColor_t col ) { fAttErr [col] = f; } - void SetQE ( Float_t f, const MCalibrationCam::PulserColor_t col ) { fQE [col] = f; } - void SetQEErr ( Float_t f, const MCalibrationCam::PulserColor_t col ) { fQEErr [col] = f; } - void SetCollEff ( Float_t f, const MCalibrationCam::PulserColor_t col ) { fCollEff [col] = f; } - void SetCollEffErr( Float_t f, const MCalibrationCam::PulserColor_t col ) { fCollEffErr[col] = f; } - - void SetColor ( const MCalibrationCam::PulserColor_t color ) { fColor = color; } - void SetLambda ( const Float_t f ) { fLambda = f; } - void SetLambdaVar ( const Float_t f ) { fLambdaVar = f; } - void SetLambdaCheck ( const Float_t f ) { fLambdaCheck = f; } - void SetLambdaCheckErr ( const Float_t f ) { fLambdaCheckErr = f; } - void SetMu0 ( const Float_t f ) { fMu0 = f; } - void SetMu0Err ( const Float_t f ) { fMu0Err = f; } - void SetMu1 ( const Float_t f ) { fMu1 = f; } - void SetMu1Err ( const Float_t f ) { fMu1Err = f; } - void SetSigma0 ( const Float_t f ) { fSigma0 = f; } - void SetSigma0Err ( const Float_t f ) { fSigma0Err = f; } - void SetSigma1 ( const Float_t f ) { fSigma1 = f; } - void SetSigma1Err ( const Float_t f ) { fSigma1Err = f; } - - void SetOscillating ( const Bool_t b=kTRUE ); - void SetChargeFitValid ( const Bool_t b=kTRUE ); - void SetPedestalFitOK ( const Bool_t b=kTRUE ); - void SetSinglePheFitOK ( const Bool_t b=kTRUE ); - void SetFluxInsidePlexiglassAvailable( const Bool_t b=kTRUE); - - ClassDef(MCalibrationChargeBlindPix, 3) // Container Charge Calibration Results Blind Pixel -}; - -#endif Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc (revision 5129) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc (revision 5130) @@ -464,7 +464,4 @@ // Get the reduced Sigma: // - If fRSigmaSquare is smaller than 0 (i.e. has not yet been set), return -1. -// - Test bit kHiGainSaturation: -// If yes, return square root of fRSigmaSquare, multiplied with fConversionHiLo, -// If no , return square root of fRSigmaSquare // Float_t MCalibrationChargePix::GetRSigma() const @@ -483,8 +480,4 @@ // - Calculate the absolute variance of the reduced sigma with the formula: // reduced sigma variance = 0.25 * fRSigmaSquareVar / fRSigmaSquare -// - Test bit kHiGainSaturation: -// If yes, returns the square root of the quadratic sum of the relative variances of the -// reduced sigma and fConversionHiLo, mulitplied with GetRSigma() -// Else returns the square root of rel. (0.25*fRSigmaSquareVar / fRSigmaSquare) // Float_t MCalibrationChargePix::GetRSigmaErr() const Index: /trunk/MagicSoft/Mars/mcalib/Makefile =================================================================== --- /trunk/MagicSoft/Mars/mcalib/Makefile (revision 5129) +++ /trunk/MagicSoft/Mars/mcalib/Makefile (revision 5130) @@ -61,6 +61,4 @@ MCalibrationBlindCamOneOldStyle.cc \ MCalibrationBlindCamTwoNewStyle.cc \ - MCalibrationChargeBlindCam.cc \ - MCalibrationChargeBlindPix.cc \ MCalibrationChargePINDiode.cc \ MMcCalibrationCalc.cc