Changeset 1666 for trunk/MagicSoft/Mars

Timestamp:

11/22/02 09:23:54 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• macros/threshold.C (modified) (2 diffs)
• mbase/MLog.h (modified) (1 diff)
• mbase/MTaskList.cc (modified) (1 diff)
• mfileio/MCT1ReadPreProc.cc (modified) (1 diff)
• mfilter/MF.cc (modified) (3 diffs)
• mfilter/MF.h (modified) (1 diff)
• mfilter/MFDataChain.cc (modified) (2 diffs)
• mhist/MH3.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                -*-*- END -*-*-
+
+ 2002/11/22: Thomas Bretz
+
+   * macros/threshold.C:
+     - Simplified the new writing routine
+
+   * mbase/MLog.h:
+     - added a Getter-function for the debug level
+
+   * mbase/MTaskList.cc: 
+     - added another debugging output
+
+   * mfilter/MF.[h,cc]:
+     - made the automatically created chain names unique
+
+   * mfilter/MFDataChain.cc:
+     - corrected the GetRule stuff ({} were missing)
+
+   * mhist/MH3.cc:
+     - added MBinning as class type to FindObject
+     - added BinningHist (without the X) as binning name for a 1D histogram
+
+
 
  2002/11/22: Abelardo Moralejo
@@ -6 +29 @@
      - Added 2nd argument to write an output file containing the 
        energy spectrum histogram.
+
+
 
  2002/11/21: Thomas Bretz

trunk/MagicSoft/Mars/macros/threshold.C

@@ -24 +24 @@
 
 
-void threshold(char* filename="data/camera.root", char* outname="")
+void threshold(TString filename="data/camera.root", TString outname="")
 {
     //
@@ -106 +106 @@
 
     // Write histogram to a file in case an output filename has been supplied:
-    if (strlen(outname) > 0)
-      {
-        TFile* f = new TFile(outname,"recreate");
-        if (f)
-          {
-            TH1F* hc = ((MHMcEnergy*)parlist.FindObject("MHMcEnergy"))->GetHistByName("MHMcEnergy");
-            hc->Write();
-            f.Close();
-          }
-      }
+    if (outname.IsNull())
+        return;
+
+    TFile f(outname, "recreate");
+    if (!f)
+        return;
+
+    parlist.FindObject("MHMcEnergy")->Write();
 }

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -65 +65 @@
 
     void SetDebugLevel(int i)           { fDebugLevel  =  i;  }
+    int GetDebugLevel() const           { return fDebugLevel; }
     void SetOutputLevel(int i)          { fOutputLevel =  i;  }
     void SetOutputDevice(int i)         { fDevice      =  i;  }

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -141 +141 @@
     //
     if (!task)
+    {
+        *fLog << err << "ERROR - task argument=NULL." << endl;
         return kFALSE;
+    }
 
     //

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -540 +540 @@
     fin.read(cheadertitle, iHEADERTITLELENGTH);
 
-    Float_t fpreprocversion, structversion, dummy;
+    Float_t fpreprocversion, structversion;
+    Int_t dummyi;
 
     sscanf(cheadertitle, cTITLE_TEMPLATE,
            &fpreprocversion, &structversion,
-           &dummy, &dummy, &dummy, &dummy);
+           &dummyi, &dummyi, &dummyi, &dummyi);
 
     if (fpreprocversion < 0.6)

trunk/MagicSoft/Mars/mfilter/MF.cc

@@ -155 +155 @@
 }
 
-MFilter *MF::ParseRule(TString &txt, MFilter *filter0) const
+MFilter *MF::ParseRule(TString &txt, MFilter *filter0, Int_t level) const
 {
     TString text;
@@ -243 +243 @@
     MFilter *newfilter;
     if (isrule)
+    {
         newfilter = new MFDataChain(text.Data(), c, num);
+        newfilter->SetName(Form("Chain%02d%c%f", level, c, num));
+    }
     else
+    {
         newfilter = new MFDataMember(text.Data(), c, num);
-
-    newfilter->SetName(Form("%s%c%f", text.Data(), c, num));
+        newfilter->SetName(Form("%s%c%f", text.Data(), c, num));
+    }
 
     return newfilter;
@@ -367 +371 @@
 
         default:
-            newfilter = ParseRule(txt, filter0);
+            newfilter = ParseRule(txt, filter0, level++);
             if (!newfilter)
             {

trunk/MagicSoft/Mars/mfilter/MF.h

@@ -25 +25 @@
     Int_t IsAlNum(TString txt) const;
 
-    MFilter *ParseRule(TString &txt, MFilter *filter0) const;
+    MFilter *ParseRule(TString &txt, MFilter *filter0, Int_t level) const;
     MFilter *ParseString(TString txt, Int_t level);
 

trunk/MagicSoft/Mars/mfilter/MFDataChain.cc

@@ -64 +64 @@
     fTitle = title ? title : "Filter using any data member of a class";
 
-    AddToBranchList(member);
+    //AddToBranchList(member);
 
     fFilterType = (type=='<' ? kELowerThan : kEGreaterThan);
@@ -111 +111 @@
 TString MFDataChain::GetRule() const
 {
-    TString ret = fData.GetRule();
+    TString ret = "{";
+    ret += fData.GetRule();
+    ret += "}";
     ret += fFilterType==kELowerThan?"<":">";
 

trunk/MagicSoft/Mars/mhist/MH3.cc

@@ -223 +223 @@
     {
     case 3:
-        binsz = (MBinning*)plist->FindObject(bname+"Z");
+        binsz = (MBinning*)plist->FindObject(bname+"Z", "MBinning");
         if (!binsz)
         {
@@ -235 +235 @@
             return kFALSE;
     case 2:
-        binsy = (MBinning*)plist->FindObject(bname+"Y");
+        binsy = (MBinning*)plist->FindObject(bname+"Y", "MBinning");
         if (!binsy)
         {
@@ -247 +247 @@
             return kFALSE;
     case 1:
-        binsx = (MBinning*)plist->FindObject(bname+"X");
+        binsx = (MBinning*)plist->FindObject(bname+"X", "MBinning");
         if (!binsx)
         {
-            *fLog << err << dbginf << "MBinning '" << bname << "X' not found... aborting." << endl;
-            return kFALSE;
+            if (fDimension==1)
+                binsx = (MBinning*)plist->FindObject(bname, "MBinning");
+
+            if (!binsx)
+            {
+                *fLog << err << dbginf << "Neither MBinning '" << bname << "X' nor '" << bname << "' found... aborting." << endl;
+                return kFALSE;
+            }
         }
         if (binsx->IsLogarithmic())