Changeset 9343 for trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

Timestamp:

02/15/09 23:12:04 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -64 +64 @@
 
 // Spectrum
-#include "../mhflux/MAlphaFitter.h"
-#include "../mhflux/MHAlpha.h"
-#include "../mhflux/MHCollectionArea.h"
-#include "../mhflux/MHEnergyEst.h"
-#include "../mhflux/MMcSpectrumWeight.h"
+#include "MAlphaFitter.h"
+#include "MHAlpha.h"
+#include "MHCollectionArea.h"
+#include "MHEnergyEst.h"
+#include "MMcSpectrumWeight.h"
+#include "MHEffectiveOnTime.h"
 
 // Eventloop
@@ -91 +92 @@
 MJSpectrum::MJSpectrum(const char *name, const char *title)
     : fCutQ(0), fCut0(0),fCut1(0), fCut2(0), fCut3(0), fCutS(0),
-    fEstimateEnergy(0), fCalcHadronness(0),  fCalcDisp(0), fForceTheta(kFALSE)
+    fEstimateEnergy(0), fCalcHadronness(0),  fCalcDisp(0),
+    fForceTheta(kFALSE), fForceRunTime(kFALSE), fForceOnTimeFit(kFALSE)
 {
     fName  = name  ? name  : "MJSpectrum";
@@ -296 +298 @@
         return -1;
 
+    // We don't have to proceed. We later overwrite the result anyway
+    if (fForceOnTimeFit)
+        return 0;
+
     const Double_t ufl = vstime->GetBinContent(0);
     const Double_t ofl = vstime->GetBinContent(vstime->GetNbinsX()+1);
@@ -750 +756 @@
     MFillH fill2(Form("HistE    [%s]", cls.Data()), "", "FillHistE");
 
+    // Fill a new MHEffectiveOnTime. It can either be used to
+    // re-calculate the on-time or just for manual cross check
+    MFillH fillT("MHEffectiveOnTime", "MTime", "FillOnTime");
+    fillT.SetNameTab("OnTime");
+
     MFDataMember f0("DataType.fVal", '<', 0.5, "FilterOffData");
     MFDataMember f1("DataType.fVal", '>', 0.5, "FilterOnData");
@@ -755 +766 @@
     fill1.SetFilter(&f0);
     fill2.SetFilter(&f1);
+    fillT.SetFilter(&f1);
 
     tlist.AddToList(&read);
     //tlist.AddToList(&taskenv0); // not necessary, stored in file!
     //tlist.AddToList(&taskenv1); // not necessary, stored in file!
+    tlist.AddToList(&f1);
+    tlist.AddToList(&fillT);
     tlist.AddToList(fCutS);
     tlist.AddToList(&taskenv2);
     tlist.AddToList(&f0);
-    tlist.AddToList(&f1);
     tlist.AddToList(&fill1);
     tlist.AddToList(&fill2);
@@ -1545 +1558 @@
     // Read from the ganymed file
     TH1D htheta, size;
-    const Float_t ontime = ReadInput(plist, htheta, size);
+    Float_t ontime = ReadInput(plist, htheta, size);
     if (ontime<0)
     {
@@ -1562 +1575 @@
     }
     plist.AddToList(&bins2); // For later use in MC processing
+
+    // -------------- Fill excess events versus energy ---------------
+
+    TH1D excess;
+
+    if (fForceOnTimeFit)
+    {
+        // Refill excess histogram to determine the excess events
+        // If we use the eff. on-time fit we have to loop over the data first
+        // This is not really desired, because if something is wrong with
+        // the Monte Carlos the program runs quite long before it fails
+        if (!Refill(plist, excess))
+            return kFALSE;
+
+        // Print the setup and result of the MAlphaFitter, print used cuts
+        PrintSetup(fit);
+
+        // ------------ On user request redo eff. on-time fit ------------
+        const MHEffectiveOnTime *htime = (MHEffectiveOnTime*)plist.FindObject("MHEffectiveOnTime");
+        if (!htime)
+        {
+            // This should never happen, bt you never know
+            *fLog << err;
+            *fLog << "ERROR - Use of new effective on-time fit requested for on-time determination," << endl;
+            *fLog << "        but MHEffectiveOnTime not found in parameter list... aborting." << endl;
+            return kFALSE;
+        }
+
+        const TH1D &h = htime->GetHEffOnTheta();
+        /*
+        if (!htime->IsConsistent() || h.GetNbinsX()!=htheta.GetNbinsX())
+        {
+            *fLog << err << "ERROR - Effective on-time from newly filles MHEffectiveOnTime (Tab='OnTime) invalid... aborting." << endl;
+            return kFALSE;
+        }*/
+
+        *fLog << inf;
+        *fLog << "Using eff. on-time from new MHEffectiveOnTime (see also 'OnTime')" << endl;
+        *fLog << "   Orig. value: " << ontime << "s" << endl;
+
+        // Copy ontime from newly filled and fitted eff on-time histogram
+        ontime = htime->GetEffOnTime();
+
+        *fLog << "   New   value: " << ontime << "s" << endl;
+
+        h.Copy(htheta);           // Copy contents of newly filled hist into on-time vs. theta
+        htheta.SetName("Theta");  // Copy overwrites the name needed in DisplayResult
+        htheta.SetDirectory(0);   // Remove from global directory added by SetName
+    }
+
+    // ---------------------------------------------------------------
 
     // Initialize weighting to a new spectrum as defined in the resource file
@@ -1612 +1676 @@
         return kFALSE;
 
-    // -------------- Fill excess events versus energy ---------------
-
     // Refill excess histogram to determine the excess events
-    TH1D excess;
-    if (!Refill(plist, excess))
-        return kFALSE;
-
-    // Print the setup and result of the MAlphaFitter, print used cuts
-    PrintSetup(fit);
-
+    if (!fForceOnTimeFit)
+    {
+        if (!Refill(plist, excess))
+            return kFALSE;
+
+        // Print the setup and result of the MAlphaFitter, print used cuts
+        PrintSetup(fit);
+    }
 
     // ------------------------- Final loop --------------------------
@@ -1768 +1831 @@
     fillsp.SetWeight();
 
-    // Try to find the class used to determine the signal!
     // FIXME: To be done: A task checking the lower 1% after the lower
     // energy limit!
@@ -1789 +1851 @@
         return kFALSE;
     par->SetVal(2);
+
+    // Not really necessary but for sanity
+    TObject *cam = plist.FindObject("MSrcPosCam");
+    if (cam)
+        cam->Clear();
 
     tlist2.AddToList(&read);