Changeset 6464

Timestamp:

02/14/05 17:50:24 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCut.cc (modified) (8 diffs)
• mjobs/MJCut.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -91 +91 @@
      - changed default values
      - added a pattern independant trigger algorithm
+
+   * mjobs/MJCut.cc:
+     - made sure both MWriteRootFile have different names
+     - don't use "same" option if no off-data
 
 

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -274 +274 @@
 }
 
-Bool_t MJCut::ProcessFile(const MDataSet &seq)
-{
-    if (!seq.IsValid())
-    {
-        *fLog << err << "ERROR - Sequences invalid!" << endl;
+Bool_t MJCut::ProcessFile(const MDataSet &set)
+{
+    if (!set.IsValid())
+    {
+        *fLog << err << "ERROR - DataSet invalid!" << endl;
         return kFALSE;
     }
@@ -288 +288 @@
     *fLog << inf;
     fLog->Separator(GetDescriptor());
-    *fLog << "Perform cuts for sequences " << seq.GetName() << endl;
+    *fLog << "Perform cuts for data set " << set.GetName() << endl;
     *fLog << endl;
 
@@ -342 +342 @@
     readoff.AddTree("Drive");
     readoff.AddTree("EffectiveOnTime");
-    seq.AddFilesOff(readoff);
+    set.AddFilesOff(readoff);
 
     const TString path(Form("%s/", fPathOut.Data()));
     TString fname0(path);
     TString fname1(path);
-    fname0 += fNameSummary.IsNull() ? Form("ganymed%08d-summary.root", seq.GetNumAnalysis()) : fNameSummary;
-    fname1 += fNameResult.IsNull()  ? Form("ganymed%08d-result.root",  seq.GetNumAnalysis()) : fNameResult;
+    fname0 += fNameSummary.IsNull() ? Form("ganymed%08d-summary.root", set.GetNumAnalysis()) : fNameSummary;
+    fname1 += fNameResult.IsNull()  ? Form("ganymed%08d-result.root",  set.GetNumAnalysis()) : fNameResult;
 
     MWriteRootFile write0(fPathOut.IsNull()?0:fname0.Data(), fOverwrite?"RECREATE":"NEW");
@@ -414 +414 @@
         return kFALSE;
 
-    if (seq.HasOffSequences())
+    if (set.HasOffSequences())
     {
         // Execute first analysis
@@ -437 +437 @@
     readon.AddTree("Drive");
     readon.AddTree("EffectiveOnTime");
-    seq.AddFilesOn(readon);
+    set.AddFilesOn(readon);
 
     MFillH fill1b("MHHillasOnPre  [MHHillas]", "MHillas", "FillHillasPre");
@@ -443 +443 @@
     fill1b.SetNameTab("PreCut");
     fill2b.SetNameTab("PostCut");
-    fill1b.SetDrawOption(seq.HasOffSequences()?"same":"");
-    fill2b.SetDrawOption(seq.HasOffSequences()?"same":"");
+    fill1b.SetDrawOption(set.HasOffSequences()?"same":"");
+    fill2b.SetDrawOption(set.HasOffSequences()?"same":"");
 
     MFillH falpha2("MHAlpha", "MHillasSrc", "FillAlpha");
@@ -470 +470 @@
         cont.Add(taskenv2.GetTask());
 
-    if (!WriteTasks(seq.GetNumAnalysis(), cont))
+    if (!WriteTasks(set.GetNumAnalysis(), cont))
         return kFALSE;
 
@@ -484 +484 @@
     // FIXME: Perform fit and plot energy dependant alpha plots
     // and fit result to new tabs!
-    if (!WriteResult(seq.GetNumAnalysis()))
+    if (!WriteResult(set.GetNumAnalysis()))
         return kFALSE;
 

trunk/MagicSoft/Mars/mjobs/MJCut.h

@@ -26 +26 @@
     TString GetOutputFile(UInt_t num) const;
     Bool_t  CheckEnvLocal();
-    void    SetupWriter(MWriteRootFile &write) const;
+    void    SetupWriter(MWriteRootFile &write, const char *name) const;
     Bool_t  WriteTasks(UInt_t num, TObjArray &cont) const;
     Bool_t  WriteResult(UInt_t num) const;
@@ -37 +37 @@
     ~MJCut();
 
-    Bool_t ProcessFile(const MDataSet &seq);
+    Bool_t ProcessFile(const MDataSet &set);
 
     void EnableStorageOfSummary(Bool_t b=kTRUE)  { fStoreSummary = b; } // See SetNameSummary