Changeset 14246 for fact/tools/marsmacros/singlepe.C

Timestamp:

06/28/12 14:10:18 (12 years ago)

Author:

Jens Buss

Message:

bug fix in scaled spectrum fit, took of likelihood fit

File:

• fact/tools/marsmacros/singlepe.C (modified) (13 diffs)

fact/tools/marsmacros/singlepe.C

@@ -161 +161 @@
 class MHSingles : public MH
 {
-    MH2F       fSignal;
-    MH2F       fTime;
-    MProfile2D fPulse;
+    TH2F       fSignal;     //changed from MH2F to TH2F
+    TH2F       fTime;       //changed from MH2F to TH2F
+    TProfile2D fPulse;      //changed from MProfile2D to TProfile2D
+
 
     UInt_t fNumEntries;
@@ -476 +477 @@
 
 int singlepe(
-//        const char *runfile, const char *drsfile, const char *outfile
+        const char *runfile, const char *drsfile, const char *outfile
 )
 {
@@ -482 +483 @@
   // ======================================================
 
-  const char *drsfile = "/fact/raw/2012/05/18/20120518_003.drs.fits.gz";
 //    const char *drsfile = "/fact/raw/2012/06/25/20120625_112.drs.fits.gz";
 
   MDirIter iter;
-  iter.AddDirectory("/fact/raw/2012/05/18", "20120518_005.fits.gz");
-//    iter.AddDirectory(gSystem->DirName(runfile), gSystem->BaseName(runfile));
-
-//    TString filename;
-//    for (UInt_t fileNr = 116; fileNr < 147; fileNr++)
-//    {
-//        filename    = "20120625_";
-//        filename   += fileNr;
-//        filename   += ".fits.gz";
-//        iter.AddDirectory("/fact/raw/2012/06/25", filename);
-//    }
-
-//     iter.AddDirectory("/fact/raw/2012/06/25", "20120625_116.fits.gz");
-//     iter.AddDirectory("/fact/raw/2012/06/25", "20120625_117.fits.gz");
-//     iter.AddDirectory("/fact/raw/2012/06/25", "20120625_118.fits.gz");
-//     iter.AddDirectory("/fact/raw/2012/06/25", "20120625_119.fits.gz");
+    iter.AddDirectory(gSystem->DirName(runfile), gSystem->BaseName(runfile));
 
   // ======================================================
@@ -677 +662 @@
 
   TH1F hGain      ("Gain",      "Gain distribution",
-                   400,  100,   300);
+                   100,  0,   400);
   hGain.SetXTitle("gain [a.u.]");
   hGain.SetYTitle("Rate");
@@ -735 +720 @@
   funcScaled.SetLineColor(kBlue);
 
+  /*
   TF1 funcScaledBL("gain_sum_spektrum", fcn, 0, 10, 5);
   funcScaledBL.SetParNames("Maximum", "Gain", "Sigma", "XtalkProb", "Offset");
   funcScaledBL.SetLineColor(kRed);
-
+  */
 
 
@@ -1061 +1047 @@
   for (UInt_t bin = 1; bin < (UInt_t)hSum.GetNbinsX()+1; bin++)
     {
-      hSumScale.SetBinError(bin, hSum.GetBinContent(bin)*0.1);
+      hSumScale.SetBinError(bin, hSumScale.GetBinContent(bin)*0.1);
     }
 
@@ -1094 +1080 @@
 
   funcScaled.SetParameters(par2);
-  funcScaledBL.SetParameters(par2);
+//  funcScaledBL.SetParameters(par2);
 //    funcScaled.FixParameter(1,0.9);
   funcScaled.FixParameter(4,0);
-  funcScaledBL.FixParameter(4,0);
+//  funcScaledBL.FixParameter(4,0);
   funcScaled.FixParameter(5,Crosstlk);
-  funcScaledBL.FixParameter(5,Crosstlk);
+//  funcScaledBL.FixParameter(5,Crosstlk);
 
   const double minScaled = par2[1]-fwhmScaled;
@@ -1108 +1094 @@
 
   funcScaled.SetRange(minScaled, maxScaled);
-  funcScaledBL.SetRange(minScaled, maxScaled);
+//  funcScaledBL.SetRange(minScaled, maxScaled);
   hSumScale.Fit(&funcScaled, "N0QS", "", minScaled, maxScaled);
-  hSumScale.Fit(&funcScaledBL, "WLN0QS", "", minScaled, maxScaled);
+//  hSumScale.Fit(&funcScaledBL, "WLN0QS", "", minScaled, maxScaled);
   funcScaled.DrawCopy("SAME");
-  funcScaledBL.DrawCopy("SAME");
+//  funcScaledBL.DrawCopy("SAME");
   //--------fit gausses to peaks of gain corrected sum specetrum -----------
 
@@ -1212 +1198 @@
   hGain.DrawCopy();
 
-
+/*
   TCanvas &c25 = d->AddTab("Spectra");
   c25.Divide(2,1);
@@ -1227 +1213 @@
   funcScaled.DrawCopy("SAME");
   funcScaledBL.DrawCopy("SAME");
-
+*/
 
   /*
@@ -1235 +1221 @@
   */
 
-  d->SaveAs("/home_nfs/isdc/jbbuss/singlepe.root");
+  d->SaveAs(outfile);
   return 0;
 }
@@ -1248 +1234 @@
   Double_t cross  = par[3];
   Double_t shift  = par[4];
-//    Double_t k      = par[5];
 
   Double_t xTalk = 1;
@@ -1262 +1247 @@
       y += xTalk*gauss;
 
-//        for (int j = 1; j < k; j++)
-//        {
       xTalk *= cross;
-//        }
+
     }