Changeset 14911 for trunk/Mars/mmuon

Timestamp:

02/13/13 10:47:33 (12 years ago)

Author:

tbretz

Message:

Reverting to last revision.

File:

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

trunk/Mars/mmuon/MHSingleMuon.cc

@@ -211 +211 @@
     for (Int_t i=0; i<entries; i++)
     {
-        const MSignalPix &pix = (*fSignalCam)[i];
-        if (fUseCleanedSignal && !pix.IsPixelUsed())
-            continue;
-
-        const MGeom  &gpix = (*fGeomCam)[i];
+        const MSignalPix &pix  = (*fSignalCam)[i];
+        const MGeom      &gpix = (*fGeomCam)[i];
 
         const Float_t dx = gpix.GetX() - cenx;
@@ -230 +227 @@
         }
 
-        // use only the inner pixels. FIXME: This is geometry dependent
+        // use only the inner pixles. FIXME: This is geometry dependent
         if (gpix.GetAidx()>0)
             continue;
@@ -237 +234 @@
     }
 
-    if (!fUseCleanedSignal)
-    {
-        // Setup the function and perform the fit
-        TF1 g1("g1", "gaus");//, -fHistTime.GetXmin(), fHistTime.GetXmax());
-
-        // Choose starting values as accurate as possible
-        g1.SetParameter(0, fHistTime.GetMaximum());
-        g1.SetParameter(1, 0);
-        g1.SetParameter(2, 0.7); // FIXME! GetRMS instead???
-
-        // According to fMuonSearchPar->GetTimeRMS() identified muons
-        // do not have an arrival time rms>3
-        g1.SetParLimits(1, -1.7, 1.7);
-        g1.SetParLimits(2,  0,   3.4);
-
-        // options : N  do not store the function, do not draw
-        //           I  use integral of function in bin rather than value at bin center
-        //           R  use the range specified in the function range
-        //           Q  quiet mode
-        if (fHistTime.Fit(&g1, "QNB"))
-            return kTRUE;
-
-        fRelTimeMean  = g1.GetParameter(1);
-        fRelTimeSigma = g1.GetParameter(2);
-    }
-    else
-    {
-        fRelTimeMean  = fMuonSearchPar->GetTime();
-        fRelTimeSigma = fMuonSearchPar->GetTimeRms();
-    }
+    // Setup the function and perform the fit
+    TF1 g1("g1", "gaus");//, -fHistTime.GetXmin(), fHistTime.GetXmax());
+
+    // Choose starting values as accurate as possible
+    g1.SetParameter(0, fHistTime.GetMaximum());
+    g1.SetParameter(1, 0);
+    g1.SetParameter(2, 0.7); // FIXME! GetRMS instead???
+
+    // According to fMuonSearchPar->GetTimeRMS() identified muons
+    // do not have an arrival time rms>3
+    g1.SetParLimits(1, -1.7, 1.7);
+    g1.SetParLimits(2,  0,   3.4);
+
+    // options : N  do not store the function, do not draw
+    //           I  use integral of function in bin rather than value at bin center
+    //           R  use the range specified in the function range
+    //           Q  quiet mode
+    if (fHistTime.Fit(&g1, "QNB"))
+        return kTRUE;
+
+    fRelTimeMean  = g1.GetParameter(1);
+    fRelTimeSigma = g1.GetParameter(2);
 
     // The mean arrival time which was subtracted before will
@@ -275 +264 @@
     {
         const MSignalPix &pix  = (*fSignalCam)[i];
-        if (fUseCleanedSignal && !pix.IsPixelUsed())
-            continue;
-
-        const MGeom &gpix = (*fGeomCam)[i];
+        const MGeom      &gpix = (*fGeomCam)[i];
 
         const Float_t dx = gpix.GetX() - cenx;
@@ -287 +273 @@
         // if the signal is not near the estimated circle, it is ignored.
         if (TMath::Abs(dist-fMuonSearchPar->GetRadius())<fMargin &&
-            (fUseCleanedSignal || TMath::Abs(pix.GetArrivalTime()-tm0) < 2*fRelTimeSigma))
+            TMath::Abs(pix.GetArrivalTime()-tm0) < 2*fRelTimeSigma)
         {
             fHistPhi.Fill(TMath::ATan2(dx, dy)*TMath::RadToDeg(), pix.GetNumPhotons());
@@ -407 +393 @@
 {
     Int_t first, last;
+
     if (!FindRangeAboveThreshold(fHistWidth, thres, first, last))
         return kFALSE;