Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 1914) +++ /trunk/MagicSoft/Mars/Changelog (revision 1915) @@ -38,4 +38,8 @@ - fixed a bug in the draw function (the drawn pixel has not been the one with the given Id, but simply the i-th entry in the array) + + * mfilter/MFCT1Supercuts.[h,cc]: + - changed naming style of variables + - changes array access Index: /trunk/MagicSoft/Mars/mfilter/MFCT1Supercuts.cc =================================================================== --- /trunk/MagicSoft/Mars/mfilter/MFCT1Supercuts.cc (revision 1914) +++ /trunk/MagicSoft/Mars/mfilter/MFCT1Supercuts.cc (revision 1915) @@ -45,107 +45,52 @@ ClassImp(MFCT1Supercuts); - -// -------------------------------------------------------------------------- -// -MFCT1Supercuts::MFCT1Supercuts(const char *hilname, const char *hilsrcname, - const char *name, const char *title) -{ - fName = name ? name : "MFCT1Supercuts"; - fTitle = title ? title : "Class to evaluate the Supercuts"; - - fHilName = hilname; - fHilSrcName = hilsrcname; -} - -// -------------------------------------------------------------------------- -// -Bool_t MFCT1Supercuts::PreProcess(MParList *pList) -{ - fHil = (MHillasExt*)pList->FindObject(fHilName, "MHillasExt"); - if (!fHil) - { - *fLog << dbginf << "MHillasExt object " << fHilName << " not found... aborting." << endl; - return kFALSE; - } - - fHilSrc = (MHillasSrc*)pList->FindObject(fHilSrcName, "MHillasSrc"); - if (!fHilSrc) - { - *fLog << dbginf << "MHillasSrc object " << fHilSrcName << " not found... aborting." << endl; - return kFALSE; - } - - fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt"); - if (!fMcEvt) - { - *fLog << dbginf << "MMcEvt not found... aborting." << endl; - return kFALSE; - } - - fEvt = (MCerPhotEvt*)pList->FindObject("MCerPhotEvt"); - if (!fEvt) - { - *fLog << dbginf << "MCerPhotEvt not found... aborting." << endl; - return kFALSE; - } - - fCam = (MGeomCam*)pList->FindObject("MGeomCam"); - if (!fCam) - { - *fLog << dbginf << "MGeomCam (Camera Geometry) missing in Parameter List... aborting." << endl; - return kFALSE; - } - fMm2Deg = fCam->GetConvMm2Deg(); - - //*fLog << "fMm2Deg = " << fMm2Deg << endl; - - +void MFCT1Supercuts::InitParams() +{ //--------------------------------- // cut parameters - - lengthup[0] = 0.315585; - lengthup[1] = 0.001455; - lengthup[2] = 0.203198; - lengthup[3] = 0.005532; - lengthup[4] =-0.001670; - lengthup[5] =-0.020362; - lengthup[6] = 0.007388; - lengthup[7] =-0.013463; - - widthup[0] = 0.145412; - widthup[1] =-0.001771; - widthup[2] = 0.054462; - widthup[3] = 0.022280; - widthup[4] =-0.009893; - widthup[5] = 0.056353; - widthup[6] = 0.020711; - widthup[7] =-0.016703; - - distup[0] = 1.787943; - distup[1] = 0.; - distup[2] = 2.942310; - distup[3] = 0.199815; - distup[4] = 0.; - distup[5] = 0.249909; - distup[6] = 0.189697; - distup[7] = 0.; - - lengthlow[0] = 0.151530; - lengthlow[1] = 0.028323; - lengthlow[2] = 0.510707; - lengthlow[3] = 0.053089; - lengthlow[4] = 0.013708; - lengthlow[5] = 2.357993; - lengthlow[6] = 0.000080; - lengthlow[7] =-0.007157; - - widthlow[0] = 0.089187; - widthlow[1] =-0.006430; - widthlow[2] = 0.074442; - widthlow[3] = 0.003738; - widthlow[4] =-0.004256; - widthlow[5] =-0.014101; - widthlow[6] = 0.006126; - widthlow[7] =-0.002849; + fLengthUp[0] = 0.315585; + fLengthUp[1] = 0.001455; + fLengthUp[2] = 0.203198; + fLengthUp[3] = 0.005532; + fLengthUp[4] =-0.001670; + fLengthUp[5] =-0.020362; + fLengthUp[6] = 0.007388; + fLengthUp[7] =-0.013463; + + fWidthUp[0] = 0.145412; + fWidthUp[1] =-0.001771; + fWidthUp[2] = 0.054462; + fWidthUp[3] = 0.022280; + fWidthUp[4] =-0.009893; + fWidthUp[5] = 0.056353; + fWidthUp[6] = 0.020711; + fWidthUp[7] =-0.016703; + + fDistUp[0] = 1.787943; + fDistUp[1] = 0.; + fDistUp[2] = 2.942310; + fDistUp[3] = 0.199815; + fDistUp[4] = 0.; + fDistUp[5] = 0.249909; + fDistUp[6] = 0.189697; + fDistUp[7] = 0.; + + fLengthLo[0] = 0.151530; + fLengthLo[1] = 0.028323; + fLengthLo[2] = 0.510707; + fLengthLo[3] = 0.053089; + fLengthLo[4] = 0.013708; + fLengthLo[5] = 2.357993; + fLengthLo[6] = 0.000080; + fLengthLo[7] =-0.007157; + + fWidthLo[0] = 0.089187; + fWidthLo[1] =-0.006430; + fWidthLo[2] = 0.074442; + fWidthLo[3] = 0.003738; + fWidthLo[4] =-0.004256; + fWidthLo[5] =-0.014101; + fWidthLo[6] = 0.006126; + fWidthLo[7] =-0.002849; distlow[0] = 0.589406; @@ -158,31 +103,86 @@ distlow[7] = 0.; - asymup[0] = 0.061267; - asymup[1] = 0.014462; - asymup[2] = 0.014327; - asymup[3] = 0.014540; - asymup[4] = 0.013391; - asymup[5] = 0.012319; - asymup[6] = 0.010444; - asymup[7] = 0.008328; - - asymlow[0] =-0.012055; - asymlow[1] = 0.009157; - asymlow[2] = 0.005441; - asymlow[3] = 0.000399; - asymlow[4] = 0.001433; - asymlow[5] =-0.002050; - asymlow[6] =-0.000104; - asymlow[7] =-0.001188; - - alphaup[0] = 13.123440; - alphaup[1] = 0.; - alphaup[2] = 0.; - alphaup[3] = 0.; - alphaup[4] = 0.; - alphaup[5] = 0.; - alphaup[6] = 0.; - alphaup[7] = 0.; + fAsymUp[0] = 0.061267; + fAsymUp[1] = 0.014462; + fAsymUp[2] = 0.014327; + fAsymUp[3] = 0.014540; + fAsymUp[4] = 0.013391; + fAsymUp[5] = 0.012319; + fAsymUp[6] = 0.010444; + fAsymUp[7] = 0.008328; + + fAsymLo[0] =-0.012055; + fAsymLo[1] = 0.009157; + fAsymLo[2] = 0.005441; + fAsymLo[3] = 0.000399; + fAsymLo[4] = 0.001433; + fAsymLo[5] =-0.002050; + fAsymLo[6] =-0.000104; + fAsymLo[7] =-0.001188; + + fAlphaUp[0] = 13.123440; + fAlphaUp[1] = 0.; + fAlphaUp[2] = 0.; + fAlphaUp[3] = 0.; + fAlphaUp[4] = 0.; + fAlphaUp[5] = 0.; + fAlphaUp[6] = 0.; + fAlphaUp[7] = 0.; //--------------------------------- +} + +// -------------------------------------------------------------------------- +// +MFCT1Supercuts::MFCT1Supercuts(const char *hilname, const char *hilsrcname, + const char *name, const char *title) +{ + fName = name ? name : "MFCT1Supercuts"; + fTitle = title ? title : "Class to evaluate the Supercuts"; + + fHilName = hilname; + fHilSrcName = hilsrcname; + + InitParams(); +} + +// -------------------------------------------------------------------------- +// +Bool_t MFCT1Supercuts::PreProcess(MParList *pList) +{ + fHil = (MHillasExt*)pList->FindObject(fHilName, "MHillasExt"); + if (!fHil) + { + *fLog << dbginf << "MHillasExt object " << fHilName << " not found... aborting." << endl; + return kFALSE; + } + + fHilSrc = (MHillasSrc*)pList->FindObject(fHilSrcName, "MHillasSrc"); + if (!fHilSrc) + { + *fLog << dbginf << "MHillasSrc object " << fHilSrcName << " not found... aborting." << endl; + return kFALSE; + } + + fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt"); + if (!fMcEvt) + { + *fLog << dbginf << "MMcEvt not found... aborting." << endl; + return kFALSE; + } + + fEvt = (MCerPhotEvt*)pList->FindObject("MCerPhotEvt"); + if (!fEvt) + { + *fLog << dbginf << "MCerPhotEvt not found... aborting." << endl; + return kFALSE; + } + + fCam = (MGeomCam*)pList->FindObject("MGeomCam"); + if (!fCam) + { + *fLog << dbginf << "MGeomCam (Camera Geometry) missing in Parameter List... aborting." << endl; + return kFALSE; + } + fMm2Deg = fCam->GetConvMm2Deg(); return kTRUE; @@ -207,8 +207,9 @@ // dd2: DIST^2 - Double_t limit = *a + *(a+1) * dd2 + *(a+2) * ct - + ls * (*(a+3) + *(a+4) * dd2 + *(a+5) * ct) - + ls2 * (*(a+6) + *(a+7) * dd2); - + const Double_t limit = + a[0] + a[1] * dd2 + a[2] * ct + + ls * (a[3] + a[4] * dd2 + a[5] * ct) + + ls2 * (a[6] + a[7] * dd2); +/* *fLog << "MFCT1Supercuts::Process; *a = " << *a << ", " << *(a+1) << ", " << *(a+2) << ", " @@ -219,5 +220,5 @@ << ", " << ls2 << ", " << ct << ", " << dd2 << ", " << limit << endl; - +*/ return limit; } @@ -260,14 +261,14 @@ if ( newdist < 1.05 - && newdist < CtsMCut (distup, dmls, dmcza, dmls2, dd2) + && newdist < CtsMCut (fDistUp, dmls, dmcza, dmls2, dd2) && newdist > CtsMCut (distlow, dmls, dmcza, dmls2, dd2) && dist < 1.05 - && length < CtsMCut (lengthup, dmls, dmcza, dmls2, dd2) - && length > CtsMCut (lengthlow, dmls, dmcza, dmls2, dd2) - && width < CtsMCut (widthup, dmls, dmcza, dmls2, dd2) - && width > CtsMCut (widthlow, dmls, dmcza, dmls2, dd2) - //&& asym < CtsMCut (asymup, dmls, dmcza, dmls2, dd2) - //&& asym > CtsMCut (asymlow, dmls, dmcza, dmls2, dd2) - && dist < CtsMCut (distup, dmls, dmcza, dmls2, dd2) + && length < CtsMCut (fLengthUp, dmls, dmcza, dmls2, dd2) + && length > CtsMCut (fLengthLo, dmls, dmcza, dmls2, dd2) + && width < CtsMCut (fWidthUp, dmls, dmcza, dmls2, dd2) + && width > CtsMCut (fWidthLo, dmls, dmcza, dmls2, dd2) + //&& asym < CtsMCut (fAsymUp, dmls, dmcza, dmls2, dd2) + //&& asym > CtsMCut (fAsymLo, dmls, dmcza, dmls2, dd2) + && dist < CtsMCut (fDistUp, dmls, dmcza, dmls2, dd2) && dist > CtsMCut (distlow, dmls, dmcza, dmls2, dd2) ) fResult = kTRUE; Index: /trunk/MagicSoft/Mars/mfilter/MFCT1Supercuts.h =================================================================== --- /trunk/MagicSoft/Mars/mfilter/MFCT1Supercuts.h (revision 1914) +++ /trunk/MagicSoft/Mars/mfilter/MFCT1Supercuts.h (revision 1915) @@ -38,16 +38,16 @@ //--------------------------------- // cut parameters - - double lengthup[8]; - double widthup[8]; - double distup[8]; - double lengthlow[8]; - double widthlow[8]; - double distlow[8]; - double asymup[8]; - double asymlow[8]; - double alphaup[8]; + Double_t fLengthUp[8]; + Double_t fWidthUp[8]; + Double_t fDistUp[8]; + Double_t fLengthLo[8]; + Double_t fWidthLo[8]; + Double_t distlow[8]; + Double_t fAsymUp[8]; + Double_t fAsymLo[8]; + Double_t fAlphaUp[8]; //--------------------------------- + void InitParams(); public: