Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 1971) +++ trunk/MagicSoft/Mars/Changelog (revision 1972) @@ -5,4 +5,7 @@ * mhist/MHHadronness.[h,cc]: - changed to support MStatusDisplay + + * manalysis/MApplyPadding.[h,cc]: + - removed Index: trunk/MagicSoft/Mars/manalysis/MApplyPadding.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MApplyPadding.cc (revision 1971) +++ (revision ) @@ -1,255 +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): Robert Wagner 10/2002 -! -! Copyright: MAGIC Software Development, 2000-2002 -! -! -\* ======================================================================== */ - -///////////////////////////////////////////////////////////////////////////// -// // -// MApplyPadding // -// // -// This task applies padding to a given Sigmabar target value. // -// The task checks whether the data stream it is applied to has to be // -// padded or not and if so, Gaussian noise with the difference in Sigma // -// is produced and added to the particular event. Number of photons and // -// error on this number is altered. // -// // -// There are three ways to define the sigmabar value to which the events // -// are padded: // -// // -// 1) Set a fixed level with SetTargetLevel // -// // -// 2) Give a TH1D* which defines the Sigmabar as function of Theta // -// with SetDefiningHistogram // -// The given histogram should have the same binning in Theta as // -// is used in the analysis // -// // -// 3) Do nothing, then PreProcess will try to read in a (workaround!) // -// propriety format ASCII database for the CT1 test. // -// the name of this file is set by SetDatabaseFile // -// Better know what you are doing or use methods 1 or 2. // -// // -// This implementation is still PRELIMINARY and requires some workarounds // -// put in SPECIFICALLY FOR THE CT1 TESTS, since a database to access is // -// missing. It is not the FINAL MAGIC VERSION. // -// // -///////////////////////////////////////////////////////////////////////////// -#include "MApplyPadding.h" - -#include - -#include "TH1.h" -#include "TH2.h" -#include "TRandom.h" - -#include "MBinning.h" -#include "MSigmabar.h" -#include "MMcEvt.hxx" -#include "MLog.h" -#include "MLogManip.h" -#include "MParList.h" -#include "MGeomCam.h" -#include "MCerPhotPix.h" -#include "MCerPhotEvt.h" -#include "MPedestalPix.h" - -ClassImp(MApplyPadding); - -// -------------------------------------------------------------------------- -// -// Default constructor. -// -MApplyPadding::MApplyPadding(const char *name, const char *title) : fRunType(0), fGroup(0), fUseHistogram(kTRUE), fFixedSigmabar(0.0), fRnd(0) -{ - fName = name ? name : "MApplyPadding"; - fTitle = title ? title : "Task to apply padding"; - Print(); -} - -// -------------------------------------------------------------------------- -// -// You can provide a TH1D* histogram containing the target Sigmabar in -// bins of theta. Be sure to use the same binning as for the analysis -// -void MApplyPadding::SetDefiningHistogram(TH1D *histo) -{ - fHSigmabarMax = histo; -} - - -// -------------------------------------------------------------------------- -// -// check if MEvtHeader exists in the Parameter list already. -// if not create one and add them to the list -// -Bool_t MApplyPadding::PreProcess(MParList *pList) -{ - fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt"); - if (!fMcEvt) - { - *fLog << err << dbginf << "MMcEvt not found... aborting." << endl; - return kFALSE; - } - - fPed = (MPedestalCam*)pList->FindObject("MPedestalCam"); - if (!fPed) - { - *fLog << dbginf << "MPedestalCam not found... aborting." << endl; - return kFALSE; - } - - fCam = (MGeomCam*)pList->FindObject("MGeomCam"); - if (!fCam) - { - *fLog << dbginf << "MGeomCam not found (no geometry information available)... aborting." << endl; - return kFALSE; - } - - fEvt = (MCerPhotEvt*)pList->FindObject("MCerPhotEvt"); - if (!fEvt) - { - *fLog << dbginf << "MCerPhotEvt not found... aborting." << endl; - return kFALSE; - } - - fSigmabar = (MSigmabar*)pList->FindCreateObj("MSigmabar"); - if (!fSigmabar) - { - *fLog << dbginf << "MSigmabar not found... aborting." << endl; - return kFALSE; - } - - // Get Theta Binning - MBinning* binstheta = (MBinning*)pList->FindObject("BinningTheta"); - if (!binstheta) - { - *fLog << err << dbginf << "BinningTheta not found... aborting." << endl; - return kFALSE; - } - - // Create fSigmabarMax histogram - // (only if no fixed Sigmabar target value or a histogram have already been - // provided) - if ((!fUseHistogram) && (fHSigmabarMax==NULL)) { - - fHSigmabarMax = new TH1D; - fHSigmabarMax->SetNameTitle("fHSigmabarMax","Sigmabarmax for this analysis"); - - MH::SetBinning(fHSigmabarMax, binstheta); - - // ------------------------------------------------- - // read in SigmabarParams - // workaround--proprietary file format--CT1test only BEGIN - // ------------------------------------------------- - - FILE *f; - if( !(f =fopen(fDatabaseFilename, "r")) ) { - *fLog << err << dbginf << "Database file " << fDatabaseFilename << "was not found... (specify with MApplyPadding::SetDatabaseFile) aborting." << endl; - return kFALSE; - } - char line[80]; - Float_t sigmabarMin, sigmabarMax, thetaMin, thetaMax, ra, dec2; - Int_t type, group, mjd, nr; - while ( fgets(line, sizeof(line), f) != NULL) { - if ((line[0]!='#')) { - sscanf(line,"%d %d %f %f %d %d %f %f %f %f",&type, &group, &ra, &dec2, &mjd, &nr, &sigmabarMin,&sigmabarMax,&thetaMin,&thetaMax); - if ((group==fGroup)||(type==1)) //selected ON group or OFF - { - // find out which bin(s) we have to look at - for (Int_t i=fHSigmabarMax->GetXaxis()->FindBin(thetaMin); - iGetXaxis()->FindBin(thetaMax)+1; i++) - if (sigmabarMax > fHSigmabarMax->GetBinContent(i)) - fHSigmabarMax->SetBinContent(i, sigmabarMax); - } - } - }//while - - // workaround--proprietary file format--CT1test only END - - // fHSigmabarMax->DrawClone(); - // fTest = new TH2D("fTest", "Test if padding works", 201, -0.05, 2.05, 201, -0.05, 2.05); - - } //!fUseHistogram - return kTRUE; -} - -// -------------------------------------------------------------------------- -// -// Calculate Sigmabar for current event -// Then apply padding -// -// 1) have current event -// 2) get sigmabar(theta) -// 3) pad event -// -Bool_t MApplyPadding::Process() -{ - // Calculate sigmabar of event - fSigmabar->Calc(*fCam, *fPed); - Double_t mySig = fSigmabar->GetSigmabar(); - - // Get sigmabar which we have to pad to - Double_t otherSig = fFixedSigmabar; - if (fUseHistogram) { - Int_t binNumber = fHSigmabarMax->GetXaxis()->FindBin(fMcEvt->GetTelescopeTheta()*kRad2Deg); - otherSig = fHSigmabarMax->GetBinContent(binNumber); - } - - // Determine quadratic difference other-mine - const Double_t quadraticDiff = otherSig*otherSig - mySig*mySig; - - // crosscheck, should never happen - if (quadraticDiff < 0) { - *fLog << err << dbginf << "Event has higher Sigmabar="< 0 - MPedestalCam newPed; - newPed.InitSize(fPed->GetSize()); - - // const UInt_t npix = fPed->GetSize(); - const UInt_t npix = fEvt->GetNumPixels(); // Total number of pixels - - for (UInt_t i=0; iGetPixRatio(pix.GetPixId()) - ); - // error: add sigma of padded noise quadratically - Double_t error = pix.GetErrorPhot(); - pix.SetErrorPhot(sqrt(error*error + quadraticDiff)); - MPedestalPix &ppix = (*fPed)[i]; - newPed[i].SetSigma(sqrt(ppix.GetSigma()*ppix.GetSigma() + quadraticDiff)); - } //for - // Calculate Sigmabar again and crosscheck - fSigmabar->Calc(*fCam, newPed); - //mySig = fSigmabar->GetSigmabar(); - // fTest->Fill(otherSig,mySig); - return kTRUE; -} - Index: trunk/MagicSoft/Mars/manalysis/MApplyPadding.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MApplyPadding.h (revision 1971) +++ (revision ) @@ -1,53 +1,0 @@ -#ifndef MARS_MApplyPadding -#define MARS_MApplyPadding - -#ifndef MARS_MTask -#include "MTask.h" -#endif - -#include "TRandom3.h" -#include "TH1.h" -#include "TH2.h" - -class MGeomCam; -class MCerPhotEvt; -class MPedestalCam; -class MMcEvt; -class MPedestalCam; -class MSigmabar; -class MParList; - -class MApplyPadding : public MTask -{ -private: - const MGeomCam *fCam; - MCerPhotEvt *fEvt; - MSigmabar *fSigmabar; - TRandom3 fRnd; - Int_t fRunType; - Int_t fGroup; - char *fDatabaseFilename; - TH1D *fHSigmabarMax; - MMcEvt *fMcEvt; - MPedestalCam *fPed; - TH2D *fTest; - Bool_t fUseHistogram; - Double_t fFixedSigmabar; - -public: - MApplyPadding(const char *name=NULL, const char *title=NULL); - - Bool_t PreProcess(MParList *pList); - Bool_t Process(); - - void SetRunType(Int_t runtype) { fRunType = runtype; } - void SetGroup(Int_t group) { fGroup = group; } - void SetDatabaseFile(char *filename) { fDatabaseFilename = filename; } - void SetTargetLevel(Double_t sigmabar) { fFixedSigmabar = sigmabar; fUseHistogram=kFALSE; } - void SetDefiningHistogram(TH1D *histo); - - ClassDef(MApplyPadding, 1) // task for applying padding -}; - -#endif -