Changeset 8172 for trunk/MagicSoft

Timestamp:

10/27/06 19:36:19 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJSpectrum.cc (modified) (7 diffs)
• mjobs/MJSpectrum.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
      - do not print observation time statistics if observation time is
        zero
+
+   * mjobs/MJSpectrum.[h,cc]:
+     - added reading and usage of "CalcHadronness" when processing 
+       the MCs
 
 

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -86 +86 @@
 MJSpectrum::MJSpectrum(const char *name, const char *title)
     : fCut0(0),fCut1(0), fCut2(0), fCut3(0), fEstimateEnergy(0),
-    fRefill(kFALSE), fSimpleMode(kTRUE), fRawMc(kFALSE),
-    fNoThetaWeights(kFALSE)
+    fCalcHadronness(0), fRefill(kFALSE), fSimpleMode(kTRUE),
+    fRawMc(kFALSE), fNoThetaWeights(kFALSE)
 {
     fName  = name  ? name  : "MJSpectrum";
@@ -105 +105 @@
     if (fEstimateEnergy)
         delete fEstimateEnergy;
+    if (fCalcHadronness)
+        delete fCalcHadronness;
 }
 
@@ -118 +120 @@
 }
 
-Bool_t MJSpectrum::ReadTask(MTask* &task, const char *name) const
+Bool_t MJSpectrum::ReadTask(MTask* &task, const char *name, Bool_t mustexist) const
 {
     if (task)
@@ -129 +131 @@
     if (!task)
     {
+        if (!mustexist)
+            return kTRUE;
         *fLog << err << dbginf << "ERROR - " << name << " doen't exist in file!" << endl;
         return kFALSE;
@@ -247 +251 @@
         return -1;
     if (!ReadTask(fCut3, "Cut3"))
+        return -1;
+    if (!ReadTask(fCalcHadronness, "CalcHadronness", kFALSE))
         return -1;
 
@@ -1179 +1185 @@
     fill8a.SetWeight();
 
+    MTaskEnv taskenv0("CalcHadronness");
+    taskenv0.SetDefault(fCalcHadronness);
+
     MEnergyEstimate est;
     MTaskEnv taskenv1("EstimateEnergy");
@@ -1196 +1205 @@
     tlist2.AddToList(&fill30);
     tlist2.AddToList(fCut0);
+    tlist2.AddToList(&taskenv0);
     tlist2.AddToList(fCut1);
     tlist2.AddToList(fCut2);

trunk/MagicSoft/Mars/mjobs/MJSpectrum.h

@@ -29 +29 @@
     MTask *fCut3;
     MTask *fEstimateEnergy;
+    MTask *fCalcHadronness;
 
     Bool_t fRefill;
@@ -36 +37 @@
 
     // Read Input
-    Bool_t  ReadTask(MTask* &task, const char *name) const;
+    Bool_t  ReadTask(MTask* &task, const char *name, Bool_t mustexist=kTRUE) const;
     Float_t ReadInput(MParList &plist, TH1D &h1, TH1D &size);
     Bool_t  ReadOrigMCDistribution(const MDataSet &set, TH1 &h, MMcSpectrumWeight &w) const;