Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 2866) +++ trunk/MagicSoft/Mars/Changelog (revision 2867) @@ -5,10 +5,29 @@ -*-*- END OF LINE -*-*- + 2004/01/21: Abelardo moralejo + + * manalysis/MMcCalibrationUpdate.[h,cc] + - Added (see below). + + * manalysis/MMcCalibrationCalc.[h,cc] + - Removed: changed name of this class to MMcCalibrationUpdate, + which is more representative of what it really does. Moved + the filling of the MCalibrationCam container from Process to + ReInit, since it does not change on an event by event basis. + Updated class description. + + * manalysis/Makefile, AnalysisLinkDef.h + - Adapted to change above + + * macros/starmc.C + - Adapted to change above + + 2004/01/21: Raquel de los Reyes * mreport/MReportCC.h, mreport/MReportTrigger.h and mcamera/MCameraCalibration.h - - Added the "Get" functions (e.g GetStatus() for fStatus) to access - the private data members of the class. + - Added the "Get" functions (e.g GetStatus() for fStatus) to access + the private data members of the class. Index: trunk/MagicSoft/Mars/macros/starmc.C =================================================================== --- trunk/MagicSoft/Mars/macros/starmc.C (revision 2866) +++ trunk/MagicSoft/Mars/macros/starmc.C (revision 2867) @@ -78,6 +78,8 @@ sigextract.SetRange(0, 5, 0, 5); - MMcCalibrationCalc mccalibcalc; - // Define conversion factor from ADC counts to photons before camera for + MMcCalibrationUpdate mccalibcalc; + + // + // Now introduce conversion factor from ADC counts to photons before camera for // inner pixels. The corresponding value for outer pixels is then calculated // automatically. Bear in mind that the conversion factor depend both on the @@ -86,4 +88,6 @@ // event loop, either from the same MC file or from a MC calibration file // written on purpose. + // (FIXME: the conversion must be calculated automatically from the analyzed file) + // mccalibcalc.SetADC2PhInner(1.2586); @@ -119,4 +123,5 @@ tlist.AddToList(&geom); tlist.AddToList(&pcopy); + tlist.AddToList(&sigextract); tlist.AddToList(&mccalibcalc); Index: trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h (revision 2866) +++ trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h (revision 2867) @@ -75,5 +75,5 @@ #pragma link C++ class MArrivalTimeCalc+; -#pragma link C++ class MMcCalibrationCalc+; +#pragma link C++ class MMcCalibrationUpdate+; #pragma link C++ class MPedPhotCam+; Index: trunk/MagicSoft/Mars/manalysis/MMcCalibrationCalc.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MMcCalibrationCalc.cc (revision 2866) +++ (revision ) @@ -1,264 +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): Abelardo Moralejo, 12/2003 -! -! Copyright: MAGIC Software Development, 2000-2003 -! -! -\* ======================================================================== */ - -///////////////////////////////////////////////////////////////////////////// -// -// MMcCalibrationCalc -// -// This task looks for the ìnformation about FADC pedestals in -// MMcFadcHeader and translates it to the pedestal mean and rms (in adc counts), -// and in the conversion factor between photons and ADC counts in -// MCalibrationCam. -// Then we create and fill also the MPedPhotCam object containing the pedestal -// rms in units of photons. -// -// Input Containers: -// MMcFadcHeader -// [MRawRunHeader] -// -// Output Containers: -// MCalibrationCam -// MPedPhotCam -// -///////////////////////////////////////////////////////////////////////////// -#include "MMcCalibrationCalc.h" - -#include "MParList.h" - -#include "MLog.h" -#include "MLogManip.h" - -#include "MCalibrationPix.h" -#include "MCalibrationCam.h" -#include "MExtractedSignalCam.h" -#include "MExtractedSignalPix.h" -#include "MGeomCam.h" -#include "MPedPhotCam.h" -#include "MPedPhotPix.h" - -#include "MRawRunHeader.h" -#include "MMcFadcHeader.hxx" - -ClassImp(MMcCalibrationCalc); - -using namespace std; - -MMcCalibrationCalc::MMcCalibrationCalc(const char *name, const char *title) -{ - fName = name ? name : "MMcCalibrationCalc"; - fTitle = title ? title : "Write MC pedestals and conversion factors into MCalibration Container"; - - fADC2PhInner = 1.; - fADC2PhOuter = 1.; - -} - -// -------------------------------------------------------------------------- -// -// Check for the run type. Return kTRUE if it is a MC run or if there -// is no MC run header (old camera files) kFALSE in case of a different -// run type -// -Bool_t MMcCalibrationCalc::CheckRunType(MParList *pList) const -{ - const MRawRunHeader *run = (MRawRunHeader*)pList->FindObject("MRawRunHeader"); - if (!run) - { - *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl; - return kTRUE; - } - - return run->GetRunType() == kRTMonteCarlo; -} - - -//--------------------------------------------------------------------------- -// -// Set ADC to photon conversion factors. -// -void MMcCalibrationCalc::SetADC2PhInner(Float_t x) -{ - fADC2PhInner = x; - - return; -} - -// -------------------------------------------------------------------------- -// -// Make sure, that there is an MCalibrationCam Object in the Parameter List. -// -Int_t MMcCalibrationCalc::PreProcess(MParList *pList) -{ - // - // If it is no MC file skip this function... - // - if (!CheckRunType(pList)) - return kTRUE; - - if ( ! pList->FindCreateObj(AddSerialNumber("MCalibrationCam"))) - { - *fLog << err << dbginf << "Cannot create MCalibrationCam... aborting." << endl; - return kFALSE; - } - - fPedPhotCam = (MPedPhotCam*) pList->FindCreateObj(AddSerialNumber("MPedPhotCam")); - if ( ! fPedPhotCam) - { - *fLog << err << dbginf << "Cannot create MPedPhotCam... aborting." << endl; - return kFALSE; - } - - fSignalCam = (MExtractedSignalCam*) pList->FindObject(AddSerialNumber("MExtractedSignalCam")); - if ( ! fSignalCam) - { - *fLog << err << dbginf << "Cannot find MExtractedSignalCam... aborting." << endl; - return kFALSE; - } - - fCalCam = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationCam")); - - if (!fCalCam) - { - *fLog << err << dbginf << "Could not create MCalibrationCam... aborting. " << endl; - return kFALSE; - } - - return kTRUE; - -} - -// -------------------------------------------------------------------------- -// -// Check for the runtype. -// Search for MCalibrationCam, MPedPhotCam and MMcFadcHeader. -// -Bool_t MMcCalibrationCalc::ReInit(MParList *pList) -{ - // - // If it is no MC file skip this function... - // - if (!CheckRunType(pList)) - return kTRUE; - - // - // Now check the existence of all necessary containers. - // - - fGeom = (MGeomCam*) pList->FindObject(AddSerialNumber("MGeomCam")); - if ( ! fGeom ) - { - *fLog << err << dbginf << "Cannot find MGeomCam... aborting." << endl; - return kFALSE; - } - - fHeaderFadc = (MMcFadcHeader*)pList->FindObject(AddSerialNumber("MMcFadcHeader")); - if (!fHeaderFadc) - { - *fLog << err << dbginf << "MMcFadcHeader not found... aborting." << endl; - return kFALSE; - } - - // - // Set the ADC to photons conversion factor for outer pixels: - // - fADC2PhOuter = fADC2PhInner * - (fHeaderFadc->GetAmplitud() / fHeaderFadc->GetAmplitudOuter()); - - // - // Set the conversion factor between high and low gain: - // - fConversionHiLo = fHeaderFadc->GetLow2HighGain(); - - return kTRUE; -} - - -// -------------------------------------------------------------------------- -// -// Fill the MCalibrationCam and MCerPhotPed objects -// -Int_t MMcCalibrationCalc::Process() -{ - const int num = fCalCam->GetSize(); - - for (int i=0; iGetNumUsedLoGainFADCSlices()*fHeaderFadc->GetPedestal(i) : - fSignalCam->GetNumUsedHiGainFADCSlices()*fHeaderFadc->GetPedestal(i); - - // - // In some cases, depending on the camera simulation parameters, one can have - // very little or no noise in the FADC. In the case the rms of pedestal is zero, - // the pixel will be cleaned out later in the image cleaning. To avoid this problem, - // we set a default value of 0.01 ADC counts for the RMS per slice: - // - - - const Float_t pedestrms = sigpix.IsLoGainUsed()? - sqrt((Double_t)(fSignalCam->GetNumUsedLoGainFADCSlices())) * - (fHeaderFadc->GetPedestalRmsLow(i)>0.? fHeaderFadc->GetPedestalRmsLow(i): 0.01) - : - sqrt((Double_t)(fSignalCam->GetNumUsedHiGainFADCSlices())) * - (fHeaderFadc->GetPedestalRmsHigh(i)>0.? fHeaderFadc->GetPedestalRmsHigh(i) : 0.01); - - calpix.SetBlindPixelMethodValid(); - calpix.SetFitValid(); - - calpix.SetConversionHiLo(fConversionHiLo); - calpix.SetConversionHiLoError(0.); // FIXME ? - - // - // Write conversion factor ADC to photons (different for inner - // and outer pixels). - // - - Float_t adc2phot = (fGeom->GetPixRatio(i) < fGeom->GetPixRatio(0))? - fADC2PhOuter : fADC2PhInner; - - calpix.SetConversionBlindPixelMethod(adc2phot, 0., 0.); - - // - // Write mean pedestal and pedestal rms per pixel - // in number of photons: - // - MPedPhotPix &pedpix = (*fPedPhotCam)[i]; - - if (sigpix.IsLoGainUsed()) - pedpix.Set(adc2phot*fConversionHiLo*pedestmean, - adc2phot*fConversionHiLo*pedestrms); - else - pedpix.Set(adc2phot*pedestmean, adc2phot*pedestrms); - - } - - return kTRUE; -} Index: trunk/MagicSoft/Mars/manalysis/MMcCalibrationCalc.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MMcCalibrationCalc.h (revision 2866) +++ (revision ) @@ -1,40 +1,0 @@ -#ifndef MARS_MMcCalibrationCalc -#define MARS_MMcCalibrationCalc - -#ifndef MARS_MTask -#include "MTask.h" -#endif - -class MCalibrationCam; -class MPedPhotCam; -class MGeomCam; -class MMcFadcHeader; -class MExtractedSignalCam; - -class MMcCalibrationCalc : public MTask -{ -private: - Bool_t CheckRunType(MParList *pList) const; - Int_t PreProcess(MParList *pList); - Int_t Process(); - Bool_t ReInit(MParList *pList); - - MCalibrationCam *fCalCam; - MPedPhotCam *fPedPhotCam; - MGeomCam *fGeom; - MMcFadcHeader *fHeaderFadc; - MExtractedSignalCam *fSignalCam; - - Float_t fADC2PhInner; // Conversion factor from ADC counts to photons - Float_t fADC2PhOuter; // for inner and outer pixels. - Float_t fConversionHiLo; - -public: - MMcCalibrationCalc(const char *name=NULL, const char *title=NULL); - - void SetADC2PhInner(Float_t x); - - ClassDef(MMcCalibrationCalc, 0) // Task which obtains, for MC files, the pedestal mean and rms, and the calibration factor from ADC counts to photons. -}; - -#endif Index: trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc (revision 2867) +++ trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc (revision 2867) @@ -0,0 +1,276 @@ +/* ======================================================================== *\ +! +! * +! * 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): Abelardo Moralejo, 12/2003 +! +! Copyright: MAGIC Software Development, 2000-2003 +! +! +\* ======================================================================== */ + +///////////////////////////////////////////////////////////////////////////// +// +// MMcCalibrationCalc +// +// This task looks for the ìnformation about FADC pedestals in +// MMcFadcHeader and translates it to the pedestal mean and rms (in adc counts). +// The conversion factor between photons and ADC counts is written in +// MCalibrationCam, using the user input (through the procedure SetADC2PhInner). +// Then it creates and fills also the MPedPhotCam object containing the pedestal +// mean and rms in units of photons. +// +// Input Containers: +// MMcFadcHeader +// MRawRunHeader +// +// Output Containers: +// MCalibrationCam +// MPedPhotCam +// +///////////////////////////////////////////////////////////////////////////// +#include "MMcCalibrationUpdate.h" + +#include "MParList.h" + +#include "MLog.h" +#include "MLogManip.h" + +#include "MCalibrationPix.h" +#include "MCalibrationCam.h" +#include "MExtractedSignalCam.h" +#include "MExtractedSignalPix.h" +#include "MGeomCam.h" +#include "MPedPhotCam.h" +#include "MPedPhotPix.h" + +#include "MRawRunHeader.h" +#include "MMcFadcHeader.hxx" + +ClassImp(MMcCalibrationUpdate); + +using namespace std; + +MMcCalibrationUpdate::MMcCalibrationUpdate(const char *name, const char *title) +{ + fName = name ? name : "MMcCalibrationUpdate"; + fTitle = title ? title : "Write MC pedestals and conversion factors into MCalibration Container"; + + fADC2PhInner = 1.; + fADC2PhOuter = 1.; + +} + +// -------------------------------------------------------------------------- +// +// Check for the run type. Return kTRUE if it is a MC run or if there +// is no MC run header (old camera files) kFALSE in case of a different +// run type +// +Bool_t MMcCalibrationUpdate::CheckRunType(MParList *pList) const +{ + const MRawRunHeader *run = (MRawRunHeader*)pList->FindObject("MRawRunHeader"); + if (!run) + { + *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl; + return kTRUE; + } + + return run->GetRunType() == kRTMonteCarlo; +} + + +//--------------------------------------------------------------------------- +// +// Set ADC to photon conversion factors. +// +void MMcCalibrationUpdate::SetADC2PhInner(Float_t x) +{ + fADC2PhInner = x; + + return; +} + +// -------------------------------------------------------------------------- +// +// Make sure, that there is an MCalibrationCam Object in the Parameter List. +// +Int_t MMcCalibrationUpdate::PreProcess(MParList *pList) +{ + // + // If it is no MC file skip this function... + // + if (!CheckRunType(pList)) + return kTRUE; + + if ( ! pList->FindCreateObj(AddSerialNumber("MCalibrationCam"))) + { + *fLog << err << dbginf << "Cannot create MCalibrationCam... aborting." << endl; + return kFALSE; + } + + fPedPhotCam = (MPedPhotCam*) pList->FindCreateObj(AddSerialNumber("MPedPhotCam")); + if ( ! fPedPhotCam) + { + *fLog << err << dbginf << "Cannot create MPedPhotCam... aborting." << endl; + return kFALSE; + } + + fSignalCam = (MExtractedSignalCam*) pList->FindObject(AddSerialNumber("MExtractedSignalCam")); + if ( ! fSignalCam) + { + *fLog << err << dbginf << "Cannot find MExtractedSignalCam... aborting." << endl; + return kFALSE; + } + + fCalCam = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationCam")); + + if (!fCalCam) + { + *fLog << err << dbginf << "Could not create MCalibrationCam... aborting. " << endl; + return kFALSE; + } + + return kTRUE; + +} + +// -------------------------------------------------------------------------- +// +// Check for the runtype. +// Search for MCalibrationCam, MPedPhotCam and MMcFadcHeader. +// +Bool_t MMcCalibrationUpdate::ReInit(MParList *pList) +{ + // + // If it is no MC file skip this function... + // + if (!CheckRunType(pList)) + return kTRUE; + + // + // Now check the existence of all necessary containers. + // + + fGeom = (MGeomCam*) pList->FindObject(AddSerialNumber("MGeomCam")); + if ( ! fGeom ) + { + *fLog << err << dbginf << "Cannot find MGeomCam... aborting." << endl; + return kFALSE; + } + + fHeaderFadc = (MMcFadcHeader*)pList->FindObject(AddSerialNumber("MMcFadcHeader")); + if (!fHeaderFadc) + { + *fLog << err << dbginf << "MMcFadcHeader not found... aborting." << endl; + return kFALSE; + } + + // + // Set the ADC to photons conversion factor for outer pixels: + // + fADC2PhOuter = fADC2PhInner * + (fHeaderFadc->GetAmplitud() / fHeaderFadc->GetAmplitudOuter()); + + // + // Set the conversion factor between high and low gain: + // + fConversionHiLo = fHeaderFadc->GetLow2HighGain(); + + + const int num = fCalCam->GetSize(); + + for (int i=0; iGetPixRatio(i) < fGeom->GetPixRatio(0))? + fADC2PhOuter : fADC2PhInner; + + calpix.SetConversionBlindPixelMethod(adc2phot, 0., 0.); + } + + + return kTRUE; +} + + +// -------------------------------------------------------------------------- +// +// Fill the MCalibrationCam and MCerPhotPed objects +// +Int_t MMcCalibrationUpdate::Process() +{ + const int num = fCalCam->GetSize(); + + for (int i=0; iGetNumUsedLoGainFADCSlices()*fHeaderFadc->GetPedestal(i) : + fSignalCam->GetNumUsedHiGainFADCSlices()*fHeaderFadc->GetPedestal(i); + + // + // In some cases, depending on the camera simulation parameters, one can + // have very little or no noise in the FADC. In the case the rms of + // pedestal is zero, the pixel will be cleaned out later in the image + // cleaning. To avoid this problem,we set a default value of 0.01 ADC + // counts for the RMS per slice: + // + + + const Float_t pedestrms = sigpix.IsLoGainUsed()? + sqrt((Double_t)(fSignalCam->GetNumUsedLoGainFADCSlices())) * + (fHeaderFadc->GetPedestalRmsLow(i)>0.? fHeaderFadc->GetPedestalRmsLow(i): 0.01) + : + sqrt((Double_t)(fSignalCam->GetNumUsedHiGainFADCSlices())) * + (fHeaderFadc->GetPedestalRmsHigh(i)>0.? fHeaderFadc->GetPedestalRmsHigh(i) : 0.01); + + // + // Write mean pedestal and pedestal rms per pixel + // in number of photons: + // + MPedPhotPix &pedpix = (*fPedPhotCam)[i]; + + Float_t adc2phot = (fGeom->GetPixRatio(i) < fGeom->GetPixRatio(0))? + fADC2PhOuter : fADC2PhInner; + + if (sigpix.IsLoGainUsed()) + pedpix.Set(adc2phot*fConversionHiLo*pedestmean, + adc2phot*fConversionHiLo*pedestrms); + else + pedpix.Set(adc2phot*pedestmean, adc2phot*pedestrms); + + } + + return kTRUE; +} Index: trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h (revision 2867) +++ trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h (revision 2867) @@ -0,0 +1,40 @@ +#ifndef MARS_MMcCalibrationUpdate +#define MARS_MMcCalibrationUpdate + +#ifndef MARS_MTask +#include "MTask.h" +#endif + +class MCalibrationCam; +class MPedPhotCam; +class MGeomCam; +class MMcFadcHeader; +class MExtractedSignalCam; + +class MMcCalibrationUpdate : public MTask +{ +private: + Bool_t CheckRunType(MParList *pList) const; + Int_t PreProcess(MParList *pList); + Int_t Process(); + Bool_t ReInit(MParList *pList); + + MCalibrationCam *fCalCam; + MPedPhotCam *fPedPhotCam; + MGeomCam *fGeom; + MMcFadcHeader *fHeaderFadc; + MExtractedSignalCam *fSignalCam; + + Float_t fADC2PhInner; // Conversion factor from ADC counts to photons + Float_t fADC2PhOuter; // for inner and outer pixels. + Float_t fConversionHiLo; + +public: + MMcCalibrationUpdate(const char *name=NULL, const char *title=NULL); + + void SetADC2PhInner(Float_t x); + + ClassDef(MMcCalibrationUpdate, 0) // Task which obtains, for MC files, the pedestal mean and rms, and the calibration factor from ADC counts to photons. +}; + +#endif Index: trunk/MagicSoft/Mars/manalysis/Makefile =================================================================== --- trunk/MagicSoft/Mars/manalysis/Makefile (revision 2866) +++ trunk/MagicSoft/Mars/manalysis/Makefile (revision 2867) @@ -84,5 +84,5 @@ MArrivalTime.cc \ MArrivalTimeCalc.cc \ - MMcCalibrationCalc.cc + MMcCalibrationUpdate.cc SRCS = $(SRCFILES)