Changeset 8676 for trunk/MagicSoft/Mars/mjobs

Timestamp:

08/18/07 15:10:25 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJSpectrum.cc (modified) (7 diffs)
• MJSpectrum.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -299 +299 @@
         fDisplay->SetStatusLine1("Getting maximum impact...");
 
-    // Create chain
+    // ----- Create chain -----
     *fLog << "Getting files... " << flush;
     TChain chain("RunHeaders");
@@ -397 +397 @@
         // Fill histogram from tree
         hfill->SetDirectory(&file);
-        t->Draw(cont, weights, "goff");
+        if (t->Draw(cont, weights, "goff")<0)
+        {
+            *fLog << err << "ERROR - Reading OriginalMC failed." << endl;
+            return kFALSE;
+        }
         hfill->SetDirectory(0);
         h.Add(hfill);
@@ -1215 +1219 @@
     plist.AddToList(&bins2);
 
-    // Initialize weighting to a new spectru
-    // m as defined in the resource file
+    // Initialize weighting to a new spectrum
+    // as defined in the resource file
     MMcSpectrumWeight weight;
     if (!InitWeighting(set, weight))
@@ -1345 +1349 @@
     fill5.SetNameTab("Threshold");
 
+    MH3 henergy("MMcEvt.fEnergy");
+    henergy.SetName("EventDist;EnergyEst");
+    henergy.SetTitle("Unweighted event distribution (Real statistics);E [GeV];Counts;");
+    henergy.Sumw2();
+
     MH3 hsize("MHillas.fSize");
     hsize.SetName("ExcessMC");
@@ -1353 +1362 @@
     plist.AddToList(&bins);
 
+    MFillH fill0a(&henergy, "", "FillEventDist");
     MFillH fill1a("MHHillasMCPre  [MHHillas]",      "MHillas",      "FillHillasPre");
     MFillH fill2a("MHHillasMCPost [MHHillas]",      "MHillas",      "FillHillasPost");
@@ -1408 +1418 @@
     tlist2.AddToList(&fill4);
     tlist2.AddToList(&fill5);
+    tlist2.AddToList(&fill0a);
     tlist2.AddToList(&fill2a);
     tlist2.AddToList(&fill3a);
@@ -1485 +1496 @@
     cont.Add(&area1);
     cont.Add(&hest);
-    cont.Add(const_cast<TEnv*>(GetEnv()));
 
     if (fDisplay)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.h

@@ -34 +34 @@
 
     Bool_t fRefill;
-    Bool_t fSimpleMode;
+    //Bool_t fSimpleMode;
+    Bool_t fForceTheta;
     Bool_t fRawMc;
     Bool_t fNoThetaWeights;
@@ -63 +64 @@
 
     void EnableRefilling(Bool_t b=kTRUE)  { fRefill=b; }
-    void EnableSimpleMode(Bool_t b=kTRUE) { fSimpleMode=b; }
+    //void EnableSimpleMode(Bool_t b=kTRUE) { fSimpleMode=b; }
     void EnableRawMc(Bool_t b=kTRUE)      { fRawMc=b; }
+    void ForceTheta(Bool_t b=kTRUE)       { fForceTheta=b; }
 
     void SetEnergyEstimator(const MTask *task);