Changeset 6987 for trunk/MagicSoft/Mars/mmuon

Timestamp:

04/29/05 18:22:01 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc

@@ -221 +221 @@
     {
         const Float_t val = h.GetBinContent(i%n + 1);
-        if (val<thres && last<0)
+        if (val<thres)
+        {
             last = i%n+1;
+            break;
+        }
     }
 
@@ -230 +233 @@
     {
         const Float_t val = h.GetBinContent(i%n + 1);
-        if (val<thres && first<0)
+        if (val<thres)
+        {
             first = i%n+1;
+            break;
+        }
     }
 
@@ -245 +251 @@
 Bool_t MHSingleMuon::CalcPhi(Double_t thres, Double_t &peakphi, Double_t &arcphi) const
 {
+    if (fHistPhi.GetMaximum()<thres)
+        return kFALSE;
+
     peakphi = 180.-fHistPhi.GetBinCenter(fHistPhi.GetMaximumBin());
 
@@ -250 +259 @@
     Int_t first, last;
 
-    if (!FindRangeAboveThreshold(fHistPhi, thres, first, last))
-        return kFALSE;
-
-    //cout << "P: " << first << " " << last << " " << last-first << endl;
+    FindRangeAboveThreshold(fHistPhi, thres, first, last);
+
+    const Int_t n    = fHistPhi.GetNbinsX();
+    const Int_t edge = fHistPhi.GetMaximumBin()+n/2;
+    if (first<0)
+        first = (edge-1)%n+1;
+    if (last<0)
+        last  = edge%n+1;;
 
     const Float_t startfitval = fHistPhi.GetBinLowEdge(first+1);
     const Float_t endfitval   = fHistPhi.GetBinLowEdge(last);
 
-    //Int_t effbinnum = TMath::Nint((endfitval-startfitval)/convbin2val);
-
-    arcphi = last<first ? 360+(endfitval-startfitval) : endfitval-startfitval;
+    arcphi = last-1<first ? 360+(endfitval-startfitval) : endfitval-startfitval;
 
     //if (fEnableImpactCalc)