Changeset 8666

Timestamp:

08/15/07 11:53:03 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mhflux/MHEnergyEst.cc (modified) (1 diff)
• mjobs/MDataSet.cc (modified) (2 diffs)
• mjobs/MDataSet.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc

@@ -504 +504 @@
 
     pad2->cd(1);
-    h = MakePlot(fHEnergy, "yx");
+    h = MakePlot(fHEnergy, "xy");
     h->SetXTitle("E_{mc} [GeV]");
     h->SetYTitle("E_{est} [GeV]");

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -397 +397 @@
 }
 
+Bool_t MDataSet::AddFilesOn(MDirIter &iter) const
+{
+    return AddSequencesFromList(fSequencesOn, iter);
+}
+
+Bool_t MDataSet::AddFilesOff(MDirIter &iter) const
+{
+    return AddSequencesFromList(fSequencesOff, iter);
+}
+
+Bool_t MDataSet::AddFiles(MDirIter &iter) const
+{
+    const Bool_t rc1 = AddFilesOff(iter);
+    const Bool_t rc2 = AddFilesOn(iter);
+    return rc1 && rc2;
+}
+
 Bool_t MDataSet::AddFilesOn(MRead &read) const
 {
     MDirIter files;
-    if (!AddSequencesFromList(fSequencesOn, files))
+    if (!AddFilesOn(files))
         return kFALSE;
     return read.AddFiles(files)>0;
@@ -408 +425 @@
 {
     MDirIter files;
-    if (!AddSequencesFromList(fSequencesOff, files))
+    if (!AddFilesOff(files))
         return kFALSE;
     return read.AddFiles(files)>0;

trunk/MagicSoft/Mars/mjobs/MDataSet.h

@@ -136 +136 @@
     Bool_t AddFilesOff(TChain &read) const;
 
+    Bool_t AddFiles(MDirIter &iter) const;
+    Bool_t AddFilesOn(MDirIter &iter) const;
+    Bool_t AddFilesOff(MDirIter &iter) const;
+
     void ReplaceDir(const TString &old, const TString &news)
     {