Changeset 7171 for trunk/MagicSoft

Timestamp:

06/27/05 19:42:25 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJSpectrum.cc (modified) (10 diffs)
• MJStar.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -59 +59 @@
 #include "../mhflux/MHAlpha.h"
 #include "../mhflux/MHCollectionArea.h"
+//#include "../mhflux/MHThreshold.h"
 #include "../mhflux/MHEnergyEst.h"
 #include "../mhflux/MMcSpectrumWeight.h"
@@ -140 +141 @@
     task->SetName(name);
 
+    if (dynamic_cast<MContinue*>(task))
+        dynamic_cast<MContinue*>(task)->SetAllowEmpty();
+
     return kTRUE;
 }
@@ -426 +430 @@
     taskenv1.SetDefault(fEstimateEnergy ? fEstimateEnergy : &est);
 
+    // FIXME: Create HistE and HistEOff to be able to modify it from
+    // the resource file.
+
     MFillH fill1(Form("HistEOff [%s]", cls.Data()), "", "FillHistEOff");
     MFillH fill2(Form("HistE    [%s]", cls.Data()), "", "FillHistE");
@@ -442 +449 @@
     tlist.AddToList(&fill2);
 
-    MEvtLoop loop(fName);
+    MEvtLoop loop("RefillExcess"); // ***** fName *****
     loop.SetParList(&plist);
     loop.SetDisplay(fDisplay);
@@ -515 +522 @@
     tlist1.AddToList(&fill0);
 
-    MEvtLoop loop1(fName);
+    MEvtLoop loop1("IntermediateLoop"); // ***** fName *****
     loop1.SetParList(&plist);
     loop1.SetLogStream(fLog);
@@ -623 +630 @@
     f.SetParameter(1, 1.9e-6);
     f.SetLineColor(kGreen);
-    spectrum.Fit(&f, "NIM", "", 100, 4000);
+    spectrum.Fit(&f, "NIM", "", 100, 5000);
     f.DrawCopy("same");
 
@@ -903 +910 @@
 
     if (!fNoThetaWeights)
-        weight.SetZdWeights(&temp1);
+        weight.SetWeightsZd(&temp1);
 
     TH1D excess;
@@ -979 +986 @@
     MFillH fill3(&area, "", "FillCollectionArea");
     MFillH fill4(&hest, "", "FillEnergyEst");
+    MFillH fill5("MHThreshold", "", "FillThreshold");
     fill3.SetWeight();
     fill4.SetWeight();
+    fill5.SetWeight();
+    fill3.SetNameTab("ColArea");
+    fill4.SetNameTab("E-Est");
+    fill5.SetNameTab("Threshold");
 
     MH3 hsize("MHillas.fSize");
@@ -1034 +1046 @@
     tlist2.AddToList(&fill3);
     tlist2.AddToList(&fill4);
+    tlist2.AddToList(&fill5);
     tlist2.AddToList(&fill2a);
     tlist2.AddToList(&fill3a);
@@ -1043 +1056 @@
     //tlist2.AddToList(&fill9a);
 
-    MEvtLoop loop2(fName);
+    MEvtLoop loop2("FillMonteCarlo"); // ***** fName *****
     loop2.SetParList(&plist);
     loop2.SetDisplay(fDisplay);

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -288 +288 @@
     // ------------------ Setup write task ----------------
 
+    // Effective on-time need its own not to be skipped by (eg) image cleaning
+    // Muons needs its own to have a unique SetReadyToSave
     const TString rule(Form("%s{s/_Y_/_I_}", fPathOut.Data()));
     MWriteRootFile write( 2, rule, fOverwrite?"RECREATE":"NEW");
-    MWriteRootFile writem(2, rule, fOverwrite?"RECREATE":"NEW");
+    MWriteRootFile writet(2, rule, fOverwrite?"RECREATE":"NEW"); // EffectiveOnTime
+    MWriteRootFile writem(2, rule, fOverwrite?"RECREATE":"NEW"); // Muons
+
     // Data
     write.AddContainer("MHillas",       "Events");
@@ -334 +338 @@
         write.AddContainer("MTimeDrive",           "Drive");
         // Effective On Time
-        write.AddContainer("MEffectiveOnTime",     "EffectiveOnTime");
-        write.AddContainer("MTimeEffectiveOnTime", "EffectiveOnTime");
+        writet.AddContainer("MEffectiveOnTime",     "EffectiveOnTime");
+        writet.AddContainer("MTimeEffectiveOnTime", "EffectiveOnTime");
     }
 
@@ -373 +377 @@
         tlist2.AddToList(&fill8);
         tlist2.AddToList(&fill9);
+        tlist2.AddToList(&writet);
     }
     //tlist2.AddToList(&fillb);