Changeset 7109 for trunk/MagicSoft/Mars/mjobs

Timestamp:

05/30/05 18:12:10 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCut.cc (modified) (8 diffs)
• MJCut.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -304 +304 @@
 
     SetNameHist(GetEnv("NameHist", fNameHist));
+    SetNameHistFS(GetEnv("NameHistFS", fNameHistFS));
 
     return kTRUE;
@@ -366 +367 @@
     }
 
-    const TString objname(Form("%s%s", "Hist"/*fNameHist.Data()*/, name));
+    const TString objname(Form("Hist%s", name));
     MHAlpha *h = (MHAlpha*)plist.FindCreateObj(fNameHist, objname);
     if (!h)
@@ -374 +375 @@
 
     return h;
+}
+
+// --------------------------------------------------------------------------
+//
+// Create a new instance of an object with name name of class
+// type fNameHistFS in parlist. It must derive from MHFalseSource
+// If something fails NULL is returned.
+//
+MH *MJCut::CreateNewHistFS(MParList &plist, const char *name) const
+{
+    const TString cname(fNameHistFS.IsNull()?"MHFalseSource":fNameHistFS);
+
+    TClass *cls = gROOT->GetClass(cname);
+    if (!cls)
+    {
+        *fLog << err << "Class " << cname << " not found in dictionary... abort." << endl;
+        return NULL;
+    }
+    if (!cls->InheritsFrom("MHFalseSource"))
+    {
+        *fLog << err << "Class " << cname << " doesn't inherit from MHFalseSource... abort." << endl;
+        return NULL;
+    }
+
+    const TString objname(Form("FS%s", name));
+    return (MH*)plist.FindCreateObj(cname, objname);
 }
 
@@ -452 +479 @@
     MHAlpha *halphaoff = CreateNewHist(plist, "Off");
     MFillH falpha(halphaoff, "", "FillHist");
-    MFillH ffs("MHFalseSourceOff [MHFalseSource]", "MHillas", "FillFS");
+    MH *hfsoff = CreateNewHistFS(plist, "Off");
+    MFillH ffs(hfsoff, "MHillas", "FillFS");
 
     // FIXME: If fPathIn read cuts and energy estimator from file!
@@ -531 +559 @@
     tlist2.AddToList(&scalc);
     tlist2.AddToList(&hcalc);
-    if (fIsWobble)
+    //if (fIsWobble)
         tlist2.AddToList(&hcalc2);
     //tlist2.AddToList(&taskenv1);
@@ -541 +569 @@
         tlist2.AddToList(&fill1a);
     tlist2.AddToList(&cont1);
-    if (!fWriteOnly && !fIsWobble)
+    if (!fWriteOnly && (!fIsWobble || !fNameHistFS.IsNull()))
         tlist2.AddToList(&ffs);
     tlist2.AddToList(&cont2);
@@ -679 +707 @@
     MHAlpha *halphaon=CreateNewHist(plist);
     MFillH falpha2(halphaon, "", "FillHist");
-    MFillH ffs2("MHFalseSource", "MHillas", "FillFS");
+    MH *hfs=CreateNewHistFS(plist);
+    MFillH ffs2(hfs, "MHillas", "FillFS");
 
     tlist.Replace(&readon);
@@ -702 +731 @@
         }
         tlist2.Replace(&falpha2);
-        if (!fIsWobble)
+        if (!fIsWobble/* || !fNameHist.IsNull()*/)
             tlist2.Replace(&ffs2);
+        if (fIsWobble && !fNameHist.IsNull())
+            tlist2.RemoveFromList(&ffs);
 
         if (!fIsMonteCarlo)

trunk/MagicSoft/Mars/mjobs/MJCut.h

@@ -10 +10 @@
 class MParList;
 class MHAlpha;
+class MH;
 class MWriteRootFile;
 
@@ -28 +29 @@
 
     TString fNameHist;
+    TString fNameHistFS;
 
     //MTask *fEstimateEnergy;
@@ -38 +40 @@
     Bool_t   WriteResult(const MParList &plist, UInt_t num) const;
     MHAlpha *CreateNewHist(MParList &plist, const char *name="") const;
+    MH      *CreateNewHistFS(MParList &plist, const char *name="") const;
 
     Bool_t   CanStoreSummary() const { return !fPathOut.IsNull() && fStoreSummary; }
@@ -61 +64 @@
 
     void SetNameHist(const char *name) { fNameHist=name; }
+    void SetNameHistFS(const char *name) { fNameHistFS=name; }
 
     //void SetEnergyEstimator(const MTask *task=0);