Changeset 18104 for trunk

Timestamp:

02/11/15 14:25:02 (10 years ago)

Author:

Daniela Dorner

Message:

implmented FACT disp parametrization instead of MAGIC one

File:

• trunk/Mars/mfilter/MFMagicCuts.cc (modified) (5 diffs)

trunk/Mars/mfilter/MFMagicCuts.cc

@@ -33 +33 @@
 //      lgsize       = log10(MHillas.fSize)
 //
-//      leakage1     = log10(MNewImagePar.fLeakage1+1)
+//      leakage1     = MNewImagePar.fLeakage1
 //
 //      alpha        = MHillasSrc.fAlpha
@@ -51 +51 @@
 //
 //    c[0],  c[5], c[6], c[7],  c[8], c[9]:
-//          xi          = c[0] + c[8]*slope + c[9]*leak +
-//                        (lgsize>c[10])*c[11]*(lgsize-c[10])^2;
+//          xi          = c[0] + c[8]*slope + c[9]*(1-1/(1+c[10]*leak))
 //          p           = xi*(1-width/length);
 //          sign1       = m3long-c[5]
@@ -316 +315 @@
     fMap[kEArea]    = fMatrix->AddColumn("MHillas.GetArea*MGeomCam.fConvMm2Deg*MGeomCam.fConvMm2Deg");
 
-    fMap[kELeakage] = fMatrix->AddColumn("log10(MNewImagePar.fLeakage1+1)");
+    //fMap[kELeakage] = fMatrix->AddColumn("log10(MNewImagePar.fLeakage1+1)");
+    fMap[kELeakage] = fMatrix->AddColumn("NewImagePar.fLeakage1");
 
     fMap[kEAlpha]   = fMatrix->AddColumn("MHillasSrc.fAlpha");
@@ -381 +381 @@
     // Get some variables
     const Double_t wdivl = fMatrix ? GetVal(kEWdivL)   : fHil->GetWidth()/fHil->GetLength();
-    const Double_t leak  = fMatrix ? GetVal(kELeakage) : TMath::Log10(fNewImgPar->GetLeakage1()+1);
+    //const Double_t leak  = fMatrix ? GetVal(kELeakage) : TMath::Log10(fNewImgPar->GetLeakage1()+1);
+    const Double_t leak  = fMatrix ? GetVal(kELeakage) : fNewImgPar->GetLeakage1();
 
     // For simplicity
@@ -388 +389 @@
     // As rule for root or MDataPhrase:
     //   ((M[3]>[3])*[4]*(M[3]-[3])^2 + [2]*M[2] + [1]*M[1] + [0])*M[0]
+    //char *r = "M[0]*([0] + [1]*M[1] + [2]*(1-1/(1+[3]*M[2])))";
     //
-    Double_t xi = c[0] + c[8]*slope + c[9]*leak;
-    if (lgsize>c[10])
-        xi += (lgsize-c[10])*(lgsize-c[10])*c[11];
+    Double_t xi = c[0] + c[8]*slope + c[9]*(1-1/(1+c[10]*leak));
+//    if (lgsize>c[10])
+//        xi += (lgsize-c[10])*(lgsize-c[10])*c[11];
 
     const Double_t disp = xi*(1-wdivl);