Changeset 7366 for trunk/MagicSoft/Mars/mmuon

Timestamp:

09/27/05 14:38:40 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmuon

Files:

• MHMuonPar.cc (modified) (4 diffs)
• MHMuonPar.h (modified) (1 diff)
• MHSingleMuon.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mmuon/MHMuonPar.cc

@@ -238 +238 @@
     AppendPad("pad4");
 }
-
+/*
 Double_t MHMuonPar::Integral(const TProfile &p, Int_t a, Int_t b) const
 {
@@ -252 +252 @@
     return denominator==0 ? 0 : numerator/denominator;
 }
-
+*/
 Double_t MHMuonPar::Integral(const TProfile &p, Float_t a, Float_t b) const
 {
@@ -258 +258 @@
     const Int_t bin2 = p.GetXaxis()->FindFixBin(b);
 
-//    return Integral(p, bin1, bin2);
     return p.Integral(bin1, bin2);
 }
@@ -268 +267 @@
         const TString txt = Form("\\Sigma_{%.2f\\circ}^{%.2f\\circ} = %.3f",
                                  fgIntegralLoLim, fgIntegralUpLim, Integral(fHistBroad));
-//                                 fgIntegralLoLim, fgIntegralUpLim, Integral(fHistBroad)*1000);
 
         TLatex text(0.55, 0.93, txt);

trunk/MagicSoft/Mars/mmuon/MHMuonPar.h

@@ -33 +33 @@
     Float_t fMm2Deg;
 
-    Double_t Integral(const TProfile &p, Int_t a, Int_t b) const;
+    //Double_t Integral(const TProfile &p, Int_t a, Int_t b) const;
     Double_t Integral(const TProfile &p, Float_t a=fgIntegralLoLim, Float_t b=fgIntegralUpLim) const;
 

trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc

@@ -130 +130 @@
     fHistTime.SetTitle("HistTime");
     fHistTime.SetXTitle("timing difference");
-    fHistTime.SetYTitle("number of pixels");
+    fHistTime.SetYTitle("Counts");
     fHistTime.SetDirectory(NULL);
     fHistTime.SetFillStyle(4000);
@@ -180 +180 @@
     ApplyBinning(*plist, "ArcPhi",    &fHistPhi);
     ApplyBinning(*plist, "MuonWidth", &fHistWidth);
-    ApplyBinning(*plist, "MuonTime", &fHistTime);
+    ApplyBinning(*plist, "MuonTime",  &fHistTime);
 
     return kTRUE;
@@ -213 +213 @@
 
         // if the signal is not near the estimated circle, it is ignored.
-        if (dist < fMuonSearchPar->GetRadius() + fMargin &&
-            dist > fMuonSearchPar->GetRadius() - fMargin)
+        if (TMath::Abs(dist-fMuonSearchPar->GetRadius())<fMargin)
         {
             fHistTime.Fill(pix.GetArrivalTime()-fMuonSearchPar->GetTime());
         }
+
         // use only the inner pixles. FIXME: This is geometry dependent
         if(i>397)
@@ -240 +240 @@
 
     //    Double_t err;
-    Double_t mean, meanerr, sig, sigerr;
-    gMinuit->GetParameter(2, sig, sigerr); // get the sigma value
-    gMinuit->GetParameter(1, mean, meanerr); // get the sigma value
+    Double_t mean, meanerr, dummy;
+    gMinuit->GetParameter(2, sig,  dummy);  // get the sigma value
+    gMinuit->GetParameter(1, mean, dummy);  // get the sigma value
 
     for (Int_t i=0; i<entries; i++)
@@ -255 +255 @@
 
         // if the signal is not near the estimated circle, it is ignored.
-        if (dist < fMuonSearchPar->GetRadius() + fMargin &&
-            dist > fMuonSearchPar->GetRadius() - fMargin)
+        if (TMath::Abs(dist-fMuonSearchPar->GetRadius())<fMargin &&
+            TMath::Abs(pix.GetArrivalTime()-fMuonSearchPar->GetTime()-mean) < 2*sig)
         {
-            if(TMath::Abs(pix.GetArrivalTime()-(fMuonSearchPar->GetTime()+mean))<2*sig)
-                fHistPhi.Fill(TMath::ATan2(dx, dy)*TMath::RadToDeg(), pix.GetNumPhotons());
+            fHistPhi.Fill(TMath::ATan2(dx, dy)*TMath::RadToDeg(), pix.GetNumPhotons());
         }
     }