Changeset 8619 for trunk/MagicSoft/Mars/mfilter

Timestamp:

06/29/07 12:47:48 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MFMagicCuts.cc (modified) (11 diffs)
• MFMagicCuts.h (modified) (1 diff)

trunk/MagicSoft/Mars/mfilter/MFMagicCuts.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 03/2005 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2005
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -38 +38 @@
 //      dist         = MHillasSrc.fDist*fMm2Deg
 //      m3long       = MHillasExt.fM3Long*sign(MHillasSrc.fCosDeltaAlpha)*fMm2Deg
+//      slope        = MHillasExt.fSlopeLong*sign(MHillasSrc.fCosDeltaAlpha)*fMm2Deg
 //
 //      antialpha    = MHillasSrcAnti.fAlpha
 //      antidist     = MHillasSrcAnti.fDist*fMm2Deg
 //      antim3long   = MHillasExt.fM3Long*sign(MHillasSrcAnti.fCosDeltaAlpha)*fMm2Deg
+//      antislope    = MHillasExt.fSlopeLong*sign(MHillasSrcAnti.fCosDeltaAlpha)*fMm2Deg
 //
 //      had          = Hadronness.fVal
@@ -48 +50 @@
 //  ------------------
 //
-//    c[0], c[5], c[6], c[7]:
+//    c[0],  c[5], c[6], c[7],  c[8], c[9]:
 //          xi          = c[0]+c[6]*pow(leakage1, c[7]);
 //          p           = xi*(1-width/length);
-//          disp        = TMath::Sign(disp, m3long-c[5])
-//          antidisp    = TMath::Sign(disp, antim3long-c[5])
+//          sign1       = m3long-c[5]
+//          sign2       = (dist-c[9])*c[8]-slope
+//          disp        = sign1<0 ||sign2<0 ? -disp : disp
+//          antisign1   = antim3long-c[5]
+//          antisign2   = (antidist-c[9])*c[8]-antislope
+//          antidisp    = antisign1<0 || antisign2<0 ? -antidisp : antidisp
 //          thetasq     = disp^2 + dist^2 - 2*disp*dist*alpha
 //          antithetasq = antidisp^2 + antidist^2 - 2*antidisp*antidist*antialpha
@@ -65 +71 @@
 //
 //    HadronnessCut:
-//    c[8], c[9]:
-//          had       <= c[8]
-//          10^lgsize >= c[9]
+//    c[10], c[11]:
+//          had       <= c[10]
+//          10^lgsize >= c[11]
 //
 //
@@ -150 +156 @@
     AddToBranchList("MHillasSrcAnti.fCosDeltaAlpha");
     AddToBranchList("MHillasExt.fM3Long");
+    AddToBranchList("MHillasExt.fSlopeLong");
     AddToBranchList("MNewImagePar.fLeakage1");
     AddToBranchList("Hadronness.fVal");
@@ -277 +284 @@
     fMatrix = mat;
 
+//    fMap[kELength] = fMatrix->AddColumn("MHillas.fLength*MGeomCam.fConvMm2Deg");
+//    fMap[kEWidth]  = fMatrix->AddColumn("MHillas.fWidth*MGeomCam.fConvMm2Deg");
+
     fMap[kEWdivL]   = fMatrix->AddColumn("MHillas.fWidth/MHillas.fLength");
     fMap[kESize]    = fMatrix->AddColumn("log10(MHillas.fSize)");
@@ -289 +299 @@
     fMap[kESrcSign] = fMatrix->AddColumn("sign(MHillasSrc.fCosDeltaAlpha)");
 
+    fMap[kESlope]   = fMatrix->AddColumn("MHillasExt.fSlopeLong*sign(MHillasSrc.fCosDeltaAlpha)/MGeomCam.fConvMm2Deg");
+
     if (fThetaCut&kOff)
     {
@@ -294 +306 @@
         fMap[kEDistAnti]   = fMatrix->AddColumn("MHillasSrcAnti.fDist*MGeomCam.fConvMm2Deg");
         fMap[kEM3LongAnti] = fMatrix->AddColumn("MHillasExt.fM3Long*sign(MHillasSrcAnti.fCosDeltaAlpha)*MGeomCam.fConvMm2Deg");
+        fMap[kESlopeAnti]  = fMatrix->AddColumn("MHillasExt.fSlopeLong*sign(MHillasSrcAnti.fCosDeltaAlpha)/MGeomCam.fConvMm2Deg");
     }
 
@@ -351 +364 @@
     const Double_t dist   = fMatrix ? GetVal(kEDist)    : fHilSrc->GetDist()*fMm2Deg;
     const Double_t alpha  = fMatrix ? GetVal(kEAlpha)   : fHilSrc->GetAlpha();
+    const Double_t sign   = fMatrix ? GetVal(kESrcSign) : MMath::Sgn(fHilSrc->GetCosDeltaAlpha());
     const Double_t m3long = fMatrix ? GetVal(kEM3Long)  : fHilExt->GetM3Long()*TMath::Sign(fMm2Deg, fHilSrc->GetCosDeltaAlpha());
-    const Double_t sign   = fMatrix ? GetVal(kESrcSign) : MMath::Sgn(fHilSrc->GetCosDeltaAlpha());
+    const Double_t slope  = fMatrix ? GetVal(kESlope)   : fHilExt->GetSlopeLong()/TMath::Sign(fMm2Deg, fHilSrc->GetCosDeltaAlpha());
+
+        // Do Ghostbusting with slope and m3l
+    const Double_t sign1 = (dist-c[9])*c[8]-slope;
+    const Double_t sign2 = m3long-c[5];
+    const Double_t p = sign1<0 || sign2<0 ? -disp : disp;
 
     // Align disp along source direction depending on third moment
-    const Double_t p = TMath::Sign(disp, m3long-c[5]);
+    //const Double_t p = TMath::Sign(disp, m3long-c[5]);
 
     // Align sign of disp along shower axis like m3long
@@ -384 +403 @@
     {
         const Double_t had = fMatrix ? GetVal(kEHadronness) : fHadronness->GetVal();
-        if (had>c[8])
+        if (had>c[10])
             return kTRUE;
 
-        if (TMath::Power(10, lgsize)<c[9])
+        if (TMath::Power(10, lgsize)<c[11])
             return kTRUE;
     }
@@ -399 +418 @@
         const Double_t alphaanti   = fMatrix ? GetVal(kEAlphaAnti)  : fHilAnti->GetAlpha();
         const Double_t m3lanti     = fMatrix ? GetVal(kEM3LongAnti) : fHilExt->GetM3Long()*TMath::Sign(fMm2Deg, fHilAnti->GetCosDeltaAlpha());
-
-        const Double_t panti       = TMath::Sign(disp, m3lanti-c[5]);
+        const Double_t slopeanti   = fMatrix ? GetVal(kESlopeAnti)  : fHilExt->GetSlopeLong()/TMath::Sign(fMm2Deg, fHilAnti->GetCosDeltaAlpha());
+
+        // Do Ghostbusting with slope and m3l
+        const Double_t sign3 = (distanti-c[9])*c[8]-slopeanti;
+        const Double_t sign4 = m3lanti-c[5];
+        const Double_t panti = sign3<0 || sign4<0 ? -disp : disp;
+
+        // Align disp along source direction depending on third moment
+        //const Double_t panti       = TMath::Sign(disp, m3lanti-c[5]);
         const Double_t thetasqanti = GetThetaSq(panti, wdivl, distanti, alphaanti);
 

trunk/MagicSoft/Mars/mfilter/MFMagicCuts.h

@@ -43 +43 @@
     enum {
         kESize, kEAlpha, kEAlphaAnti, kEArea, kEDist, kEDistAnti,
-        kEM3Long, kEM3LongAnti, kEWdivL, kELeakage, kESrcSign, kEHadronness,
+        kEM3Long, kEM3LongAnti, kEWdivL, kELeakage, kESrcSign,
+        kESlope, kESlopeAnti, kEHadronness,
         kLastElement
     };