Changeset 9851 for trunk/Mars/mimage

Timestamp:

08/12/10 09:43:02 (14 years ago)

Author:

tbretz

Message:

Changed MH::SetBinning and similar functions to take references instead of pointers as arguments. For convenience wrappers for the old style functions are provided.

Location:

trunk/Mars/mimage

Files:

• MHHillas.cc (modified) (2 diffs)
• MHHillasExt.cc (modified) (2 diffs)
• MHHillasSrc.cc (modified) (1 diff)
• MHImagePar.cc (modified) (1 diff)
• MHNewImagePar.cc (modified) (1 diff)
• MHVsSize.cc (modified) (1 diff)

trunk/Mars/mimage/MHHillas.cc

@@ -157 +157 @@
 
 
-    ApplyBinning(*plist, "Width",  fWidth);
-    ApplyBinning(*plist, "Length", fLength);
-    ApplyBinning(*plist, "Dist",   fDistC);
-    ApplyBinning(*plist, "Delta",  fDelta);
-    ApplyBinning(*plist, "Size",   fSize);
+    ApplyBinning(*plist, "Width",  *fWidth);
+    ApplyBinning(*plist, "Length", *fLength);
+    ApplyBinning(*plist, "Dist",   *fDistC);
+    ApplyBinning(*plist, "Delta",  *fDelta);
+    ApplyBinning(*plist, "Size",   *fSize);
 
     const MBinning *bins = (MBinning*)plist->FindObject("BinningCamera");
@@ -168 +168 @@
         const Float_t r = fGeomCam->GetMaxRadius()*fGeomCam->GetConvMm2Deg();
 
-        MBinning b;
-        b.SetEdges(61, -r, r);
-        SetBinning(fCenter, &b, &b);
+        const MBinning b(61, -r, r);
+        SetBinning(*fCenter, b, b);
     }
     else
-        SetBinning(fCenter, bins, bins);
+        SetBinning(*fCenter, *bins, *bins);
 
 

trunk/Mars/mimage/MHHillasExt.cc

@@ -129 +129 @@
     binsx.Apply(fHAsym);
 
-    binsx.SetEdges(100,     0,  1.5);
-    binsy.SetEdges(100,    -9,    9);
-    MH::SetBinning(&fHSlopeL, &binsx, &binsy);
+    binsx.SetEdges(100,   0, 1.5);
+    binsy.SetEdges(100,  -9,   9);
+    MH::SetBinning(fHSlopeL, binsx, binsy);
 }
 
@@ -167 +167 @@
     }
 
-    ApplyBinning(*plist, "Asym", &fHAsym);
-    ApplyBinning(*plist, "M3Long", &fHM3Long);
-    ApplyBinning(*plist, "M3Trans", &fHM3Trans);
-    ApplyBinning(*plist, "Dist", "Slope", &fHSlopeL);
+    ApplyBinning(*plist, "Asym",             fHAsym);
+    ApplyBinning(*plist, "M3Long",           fHM3Long);
+    ApplyBinning(*plist, "M3Trans",          fHM3Trans);
+    ApplyBinning(*plist, "Dist",    "Slope", fHSlopeL);
 
     return kTRUE;

trunk/Mars/mimage/MHHillasSrc.cc

@@ -135 +135 @@
     }
 
-    ApplyBinning(*plist, "Alpha",    fAlpha);
-    ApplyBinning(*plist, "Dist",     fDist);
-    ApplyBinning(*plist, "DCA",      fDCA);
-    ApplyBinning(*plist, "DCADelta", fDCADelta);
+    ApplyBinning(*plist, "Alpha",    *fAlpha);
+    ApplyBinning(*plist, "Dist",     *fDist);
+    ApplyBinning(*plist, "DCA",      *fDCA);
+    ApplyBinning(*plist, "DCADelta", *fDCADelta);
 
     return kTRUE;

trunk/Mars/mimage/MHImagePar.cc

@@ -145 +145 @@
 Bool_t MHImagePar::SetupFill(const MParList *plist)
 {
-    ApplyBinning(*plist, "Pixels",  &fHistSatLo);
-    ApplyBinning(*plist, "Pixels",  &fHistSatHi);
-    ApplyBinning(*plist, "Pixels",  &fHistNumSP);
-
-    ApplyBinning(*plist, "Islands", &fHistIslands);
-
-    ApplyBinning(*plist, "Size",    &fHistSizeSubIslands);
-    ApplyBinning(*plist, "Size",    &fHistSizeMainIsland);
-    ApplyBinning(*plist, "Size",    &fHistSizeSP);
+    ApplyBinning(*plist, "Pixels",  fHistSatLo);
+    ApplyBinning(*plist, "Pixels",  fHistSatHi);
+    ApplyBinning(*plist, "Pixels",  fHistNumSP);
+
+    ApplyBinning(*plist, "Islands", fHistIslands);
+
+    ApplyBinning(*plist, "Size",    fHistSizeSubIslands);
+    ApplyBinning(*plist, "Size",    fHistSizeMainIsland);
+    ApplyBinning(*plist, "Size",    fHistSizeSP);
 
     return kTRUE;

trunk/Mars/mimage/MHNewImagePar.cc

@@ -197 +197 @@
     }
 
-    ApplyBinning(*plist, "Leakage", &fHistLeakage1);
-    ApplyBinning(*plist, "Leakage", &fHistLeakage2);
-
-    ApplyBinning(*plist, "Pixels",  &fHistUsedPix);
-    ApplyBinning(*plist, "Pixels",  &fHistCorePix);
-
-    //ApplyBinning(*plist, "Area",    &fHistUsedArea);
-    //ApplyBinning(*plist, "Area",    &fHistCoreArea);
-
-    ApplyBinning(*plist, "Conc",     &fHistConc);
-    ApplyBinning(*plist, "Conc1",    &fHistConc1);
-    ApplyBinning(*plist, "ConcCOG",  &fHistConcCOG);
-    ApplyBinning(*plist, "ConcCore", &fHistConcCore);
+    ApplyBinning(*plist, "Leakage", fHistLeakage1);
+    ApplyBinning(*plist, "Leakage", fHistLeakage2);
+
+    ApplyBinning(*plist, "Pixels",  fHistUsedPix);
+    ApplyBinning(*plist, "Pixels",  fHistCorePix);
+
+    //ApplyBinning(*plist, "Area",    fHistUsedArea);
+    //ApplyBinning(*plist, "Area",    fHistCoreArea);
+
+    ApplyBinning(*plist, "Conc",     fHistConc);
+    ApplyBinning(*plist, "Conc1",    fHistConc1);
+    ApplyBinning(*plist, "ConcCOG",  fHistConcCOG);
+    ApplyBinning(*plist, "ConcCore", fHistConcCore);
 
     return kTRUE;

trunk/Mars/mimage/MHVsSize.cc

@@ -100 +100 @@
     fM3Long.SetYTitle("M3Long [\\circ]");
 
-    MBinning binse, binsl, binsd, binsc, binsa, binsm;
-    binse.SetEdgesLog( 50,   10, 1e5);
-    binsl.SetEdges(   100,    0, 0.5);
-    binsd.SetEdges(   100,    0, 2.0);
-    binsc.SetEdgesLog(100, 3e-3, 1);
-    binsa.SetEdges(   100,    0, 0.25);
-    binsm.SetEdges(   100, -1.5, 1.5);
-
-    MH::SetBinning(&fLength, &binse, &binsl);
-    MH::SetBinning(&fWidth,  &binse, &binsl);
-    MH::SetBinning(&fDist,   &binse, &binsd);
-    MH::SetBinning(&fConc1,  &binse, &binsc);
-    MH::SetBinning(&fArea,   &binse, &binsa);
-    MH::SetBinning(&fM3Long, &binse, &binsm);
+    const MBinning binse( 50,   10, 1e5, "", "log");
+    const MBinning binsc(100, 3e-3, 1,   "", "log");
+    const MBinning binsl(100,    0, 0.5);
+    const MBinning binsd(100,    0, 2.0);
+    const MBinning binsa(100,    0, 0.25);
+    const MBinning binsm(100, -1.5, 1.5);
+
+    MH::SetBinning(fLength, binse, binsl);
+    MH::SetBinning(fWidth,  binse, binsl);
+    MH::SetBinning(fDist,   binse, binsd);
+    MH::SetBinning(fConc1,  binse, binsc);
+    MH::SetBinning(fArea,   binse, binsa);
+    MH::SetBinning(fM3Long, binse, binsm);
 
     fLength.UseCurrentStyle();