Changeset 9851 for trunk/Mars/mhflux

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/mhflux

Files:

• MHAlpha.cc (modified) (3 diffs)
• MHCollectionArea.cc (modified) (2 diffs)
• MHDisp.cc (modified) (1 diff)
• MHEffectiveOnTime.cc (modified) (2 diffs)
• MHEnergyEst.cc (modified) (2 diffs)
• MHFalseSource.cc (modified) (3 diffs)
• MHThetaSq.cc (modified) (2 diffs)
• MHThetaSqN.cc (modified) (2 diffs)
• MHThreshold.cc (modified) (1 diff)

trunk/Mars/mhflux/MHAlpha.cc

@@ -142 +142 @@
     binsa.Apply(fHistTime);
 
-    MH::SetBinning(&fHist, &binst, &binse, &binsa);
+    MH::SetBinning(fHist, binst, binse, binsa);
 }
 
@@ -334 +334 @@
     binst.Apply(fHTheta);
     binsa.Apply(fHistTime);
-    MH::SetBinning(&fHist, &binst, &binse, &binsa);
+    MH::SetBinning(fHist, binst, binse, binsa);
 
     MAlphaFitter *fit = (MAlphaFitter*)pl->FindObject("MAlphaFitter");
@@ -353 +353 @@
     // If this is the first call we have to initialize the time-histogram
     //
-    MBinning bins;
-    bins.SetEdges(1, t.GetAxisTime()-60, t.GetAxisTime());
+    const MBinning bins(1, t.GetAxisTime()-60, t.GetAxisTime());
     bins.Apply(fHTime);
 

trunk/Mars/mhflux/MHCollectionArea.cc

@@ -109 +109 @@
     binse.Apply(fHEnergy);
 
-    MH::SetBinning(&fHistSel, &binst, &binse);
-    MH::SetBinning(&fHistAll, &binst, &binse);
+    MH::SetBinning(fHistSel, binst, binse);
+    MH::SetBinning(fHistAll, binst, binse);
 
     // For some unknown reasons this must be called after
@@ -202 +202 @@
     binse.Apply(fHEnergy);
 
-    MH::SetBinning(&fHistSel, &binst, &binse);
-    MH::SetBinning(&fHistAll, &binst, &binse);
+    MH::SetBinning(fHistSel, binst, binse);
+    MH::SetBinning(fHistAll, binst, binse);
 
     fMcAreaRadius   = -1;

trunk/Mars/mhflux/MHDisp.cc

@@ -132 +132 @@
     binsx.SetEdges(fHist, 'x');
     binsy.SetEdges(fHist, 'y');
-    MH::SetBinning(&fHistBg, &binsx, &binsy);
+    MH::SetBinning(fHistBg, binsx, binsy);
 
     if (!fHistOff)
     {
-        MH::SetBinning(&fHistBg1, &binsx, &binsy);
-        MH::SetBinning(&fHistBg2, &binsx, &binsy);
+        MH::SetBinning(fHistBg1, binsx, binsy);
+        MH::SetBinning(fHistBg2, binsx, binsy);
     }
 

trunk/Mars/mhflux/MHEffectiveOnTime.cc

@@ -435 +435 @@
     btime.SetEdges(50, 0, 0.1);
 
-    MH::SetBinning(&fH2DeltaT, &btime, &btheta);
+    MH::SetBinning(fH2DeltaT, btime, btheta);
 
     btime.Apply(fH1DeltaT);
@@ -480 +480 @@
    }
    if (binstheta && binsdtime)
-       SetBinning(&fH2DeltaT, binsdtime, binstheta);
+       SetBinning(fH2DeltaT, *binsdtime, *binstheta);
 
    fTotalTime = 0;

trunk/Mars/mhflux/MHEnergyEst.cc

@@ -113 +113 @@
     binsi.SetEdges(1, 0, 1000);
 
-    SetBinning(&fHEnergy,     &binse, &binse, &binst);
-    SetBinning(&fHImpact,     &binsi, &binsr);
-
-    SetBinning(&fHResolutionEst, &binse, &binsr);
-    SetBinning(&fHResolutionMC,  &binse, &binsr);
+    SetBinning(fHEnergy, binse, binse, binst);
+    SetBinning(fHImpact, binsi, binsr);
+
+    SetBinning(fHResolutionEst, binse, binsr);
+    SetBinning(fHResolutionMC,  binse, binsr);
 
     // For some unknown reasons this must be called after
@@ -165 +165 @@
     binsr.SetEdges(*plist, "BinningEnergyRes");
 
-    SetBinning(&fHEnergy,     &binse, &binse, &binst);
-    SetBinning(&fHImpact,     &binsi, &binsr);
-
-    SetBinning(&fHResolutionEst, &binse, &binsr);
-    SetBinning(&fHResolutionMC,  &binse, &binsr);
+    SetBinning(fHEnergy, binse, binse, binst);
+    SetBinning(fHImpact, binsi, binsr);
+
+    SetBinning(fHResolutionEst, binse, binsr);
+    SetBinning(fHResolutionMC,  binse, binsr);
 
     fChisq = 0;

trunk/Mars/mhflux/MHFalseSource.cc

@@ -258 +258 @@
 
     if (fHistOff)
-        MH::SetBinning(&fHist, fHistOff);
+        MH::SetBinning(fHist, *fHistOff);
     else
     {
@@ -269 +269 @@
             const Float_t r = (geom ? geom->GetMaxRadius()/3 : 200)*fMm2Deg;
 
-            MBinning b;
-            b.SetEdges(20, -r, r);
-            SetBinning(&fHist, &b, &b, &binsa);
+            const MBinning b(20, -r, r);
+            SetBinning(fHist, b, b, binsa);
         }
         else
-            SetBinning(&fHist, bins, bins, &binsa);
+            SetBinning(fHist, *bins, *bins, binsa);
     }
 
@@ -502 +501 @@
 
     TH2D h;
-    MH::SetBinning(&h, h2);
+    MH::SetBinning(h, *h2);
 
     // Divide by number of entries in off region (of off-data)

trunk/Mars/mhflux/MHThetaSq.cc

@@ -95 +95 @@
     binsa.Apply(fHistTime);
 
-    MH::SetBinning(&fHist, &binst, &binse, &binsa);
+    MH::SetBinning(fHist, binst, binse, binsa);
 }
 
@@ -132 +132 @@
     // Apply binning
     binsa.Apply(fHistTime);
-    MH::SetBinning(&fHist, &binst, &binse, &binsa);
+    MH::SetBinning(fHist, binst, binse, binsa);
 
     // Remark: Binnings might be overwritten in MHAlpha::SetupFill

trunk/Mars/mhflux/MHThetaSqN.cc

@@ -98 +98 @@
     binsa.Apply(fHistTime);
 
-    MH::SetBinning(&fHist, &binst, &binse, &binsa);
+    MH::SetBinning(fHist, binst, binse, binsa);
 
     fParameter = new MParameterD;
@@ -142 +142 @@
     // Apply binning
     binsa.Apply(fHistTime);
-    MH::SetBinning(&fHist, &binst, &binse, &binsa);
+    MH::SetBinning(fHist, binst, binse, binsa);
 
     // Remark: Binnings might be overwritten in MHAlpha::SetupFill

trunk/Mars/mhflux/MHThreshold.cc

@@ -98 +98 @@
     }
 
-    ApplyBinning(*pl, "Threshold", &fHEnergy);
+    ApplyBinning(*pl, "Threshold", fHEnergy);
 
     return kTRUE;