Changeset 7369 for trunk/MagicSoft

Timestamp:

09/27/05 17:11:09 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• datacenter/macros/fillstar.C (modified) (1 diff)
• mmuon/MHMuonPar.cc (modified) (2 diffs)
• mmuon/MHSingleMuon.cc (modified) (4 diffs)
• mmuon/MHSingleMuon.h (modified) (1 diff)
• mmuon/MMuonCalibParCalc.cc (modified) (1 diff)
• mmuon/MMuonSearchPar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -32 +32 @@
    * mmuon/MHMuonPar.[h,cc]:
      - commented out old obsolete member function
+     - updated reference lines
 
    * mmuon/MHSingleMuon.[h,cc]:
@@ -48 +49 @@
      - replaced wrong calculation of size via integral by
        new member function CalcSize
+
+   * datacenter/macros/fillstar.C:
+     - updated reference values
 
 

trunk/MagicSoft/Mars/datacenter/macros/fillstar.C

@@ -113 +113 @@
     }
 
-    Float_t psf   = (hmuon->GetMeanWidth() - 0.04816)/0.001294;
+    Float_t mw    = hmuon->GetMeanWidth();
+    Float_t psf   = -194.031674+404.077598*mw-192.532597*mw*mw;
     psf = TMath::Nint(psf*10)/10.;
     TString PSF = Form("%5.1f", psf);
     Int_t   num = (int)hmuon->GetEntries();
 
-    Float_t integralmc = -1.43*psf + 1035;
-    Float_t ratiodatamc = (hmuon->GetMeanSize()/integralmc)*100;
+    Float_t ratiodatamc = (hmuon->GetMeanSize()/9326.)*100;
     TString ratio = Form("%5.1f", ratiodatamc);
 

trunk/MagicSoft/Mars/mmuon/MHMuonPar.cc

@@ -214 +214 @@
     txt.SetTextColor(kBlue);
 
-    TF1 ref("RefShape100%", "573*x + 430", fgIntegralLoLim, fgIntegralUpLim);
+    TF1 ref("RefShape100%", "-254+1640*x-565*x*x", fgIntegralLoLim, fgIntegralUpLim);
+    // old: 573*x + 430
     ref.SetLineColor(kBlue);
     ref.SetLineWidth(1);
@@ -230 +231 @@
 
     ref.SetName("RefShape12mm");
-    ref.Compile("0.0766*x*x - 0.250*x + 0.239");
+    ref.Compile("0.0655*x*x - 0.226*x + 0.226");
     gROOT->GetListOfFunctions()->Remove(ref.DrawCopy("same"));
 

trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc

@@ -142 +142 @@
     bins.Apply(fHistWidth);
 
-    bins.SetEdges(100, -10, 10);
+    bins.SetEdges(101, -10, 10);
     bins.Apply(fHistTime);
 }
@@ -230 +230 @@
     g1.SetParameter(0, fHistTime.GetMaximum());
     g1.SetParameter(1, 0);
-    g1.SetParameter(2, 0.3);
+    g1.SetParameter(2, 0.2);
+
     g1.SetParLimits(1, -0.5, 0.5);
     g1.SetParLimits(2, 0, 1);
@@ -261 +262 @@
         }
     }
+
     // error estimation (temporaly)
     //  The error is estimated from the signal. In order to do so, we have to
@@ -505 +507 @@
 */
 
+Float_t MHSingleMuon::CalcSize() const
+{
+    const Int_t n = fHistPhi.GetNbinsX();
+
+    Double_t sz=0;
+    for (Int_t i=1; i<=n; i++)
+        sz += fHistPhi.GetBinContent(i)*fHistPhi.GetBinEntries(i);
+
+    return sz;
+}
+
 void MHSingleMuon::Paint(Option_t *o)
 {

trunk/MagicSoft/Mars/mmuon/MHSingleMuon.h

@@ -43 +43 @@
     const TProfile &GetHistWidth() const { return fHistWidth; }
 
+    Float_t CalcSize() const;
+
     void Draw(Option_t *o="");
     void Paint(Option_t *o="");

trunk/MagicSoft/Mars/mmuon/MMuonCalibParCalc.cc

@@ -167 +167 @@
 
     // Get Muon Size
-    fMuonCalibPar->SetMuonSize(fHist->GetHistPhi().Integral());
+    //fMuonCalibPar->SetMuonSize(fHist->GetHistPhi().Integral());
+
+    fMuonCalibPar->SetMuonSize(fHist->CalcSize());
 
     // Calculate ArcPhi

trunk/MagicSoft/Mars/mmuon/MMuonSearchPar.cc

@@ -159 +159 @@
     Int_t q=0;
 
-    Float_t mean=0;
-    Float_t sq  =0;
+    Double_t mean=0;
+    Double_t sq  =0;
 
     for (int i=0; i<n; i++)
     {
         const MSignalPix &pix = evt[i];
-
-        if (pix.IsPixelUsed())
-        {
-            fSignal[p] = pix.GetNumPhotons();
-
-            fX[p] = geom[i].GetX();
-            fY[p] = geom[i].GetY();
-            p++;
-
-            //timing
-            if (!pix.IsPixelCore())
-                continue;
-
-            mean += pix.GetArrivalTime();
-            sq   += pix.GetArrivalTime()*pix.GetArrivalTime();
-            q++;
-        }
+        if (!pix.IsPixelUsed())
+            continue;
+
+        fSignal[p] = pix.GetNumPhotons();
+
+        fX[p] = geom[i].GetX();
+        fY[p] = geom[i].GetY();
+        p++;
+
+        //timing
+        if (!pix.IsPixelCore())
+            continue;
+
+        mean += pix.GetArrivalTime();
+        sq   += pix.GetArrivalTime()*pix.GetArrivalTime();
+        q++;
     }