Changeset 4698 for trunk/MagicSoft/Mars

Timestamp:

08/23/04 09:06:37 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbadpixels/MBadPixelsTreat.cc (modified) (5 diffs)
• mbadpixels/MBadPixelsTreat.h (modified) (3 diffs)
• mfileio/MReadTree.h (modified) (1 diff)
• mfileio/MWriteRootFile.cc (modified) (1 diff)
• mfileio/MWriteRootFile.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/08/23: Thomas Bretz
+
+   * mbadpixels/MBadPixelsTreat.[h,cc]:
+     - changed missleading ProcessRMS to ProcessPedestal
+
+   * mfileio/MReadTree.h:
+     - added AddFiles(MDirIter&) which is overloaded by another function
+       which resulted in some trouble
+
+   * mfileio/MWriteRootFile.[h,cc]:
+     - added cd() member function
+
+
 
  2004/08/20: Thomas Bretz

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

@@ -537 +537 @@
 // --------------------------------------------------------------------------
 //
-// Interpolate Pedestals if kProcessRMS not set
+// Interpolate Pedestals if kProcessPedestal not set
 //
 Bool_t MBadPixelsTreat::ReInit(MParList *pList)
 {
-    if (!TESTBIT(fFlags, kProcessRMS))
+    if (!TESTBIT(fFlags, kProcessPedestal))
         InterpolatePedestals();
     return kTRUE;
@@ -555 +555 @@
     {
         InterpolateSignal();
-        if (TESTBIT(fFlags, kProcessRMS))
+        if (TESTBIT(fFlags, kProcessPedestal))
             InterpolatePedestals();
     }
@@ -580 +580 @@
     if (TESTBIT(fFlags, kUseCentralPixel))
         out << "   " << GetUniqueName() << ".SetUseCentralPixel();" << endl;
-    if (TESTBIT(fFlags, kProcessRMS))
-        out << "   " << GetUniqueName() << ".SetProcessRMS();" << endl;
+    if (TESTBIT(fFlags, kProcessPedestal))
+        out << "   " << GetUniqueName() << ".SetProcessPedestal();" << endl;
     if (TESTBIT(fFlags, kHardTreatment))
         out << "   " << GetUniqueName() << ".SetHardTreatment();" << endl;
@@ -594 +594 @@
 //   MBadPixelsTreat.UseCentralPixel:  no
 //   MBadPixelsTreat.HardTreatment:    no
-//   MBadPixelsTreat.ProcessRMS:       no
+//   MBadPixelsTreat.ProcessPedestal:  no
 //   MBadPixelsTreat.NumMinNeighbors:  3
 //
@@ -615 +615 @@
         SetHardTreatment(GetEnvValue(env, prefix, "HardTreatment", IsHardTreatment()));
     }
-    if (IsEnvDefined(env, prefix, "ProcessRMS", print))
+    if (IsEnvDefined(env, prefix, "ProcessPedestal", print))
     {
         rc = kTRUE;
-        SetProcessRMS(GetEnvValue(env, prefix, "ProcessRMS", IsProcessRMS()));
+        SetProcessPedestal(GetEnvValue(env, prefix, "ProcessPedestal", IsProcessPedestal()));
     }
     if (IsEnvDefined(env, prefix, "NumMinNeighbors", print))

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h

@@ -27 +27 @@
         kUseInterpolation = 1,
         kUseCentralPixel  = 2,
-        kProcessRMS       = 3,
+        kProcessPedestal  = 3,
         kHardTreatment    = 4
     };
@@ -56 +56 @@
         b ? SETBIT(fFlags, kUseCentralPixel) : CLRBIT(fFlags, kUseCentralPixel);
     }
-    void SetProcessRMS(Bool_t b=kTRUE)
+    void SetProcessPedestal(Bool_t b=kTRUE)
     {
-        b ? SETBIT(fFlags, kProcessRMS) : CLRBIT(fFlags, kProcessRMS);
+        b ? SETBIT(fFlags, kProcessPedestal) : CLRBIT(fFlags, kProcessPedestal);
     }
     void SetHardTreatment(Bool_t b=kTRUE)
@@ -66 +66 @@
 
     Bool_t IsHardTreatment() const    { return TESTBIT(fFlags, kHardTreatment); }
-    Bool_t IsProcessRMS() const       { return TESTBIT(fFlags, kProcessRMS); }
+    Bool_t IsProcessPedestal() const  { return TESTBIT(fFlags, kProcessPedestal); }
     Bool_t IsUseCentralPixel() const  { return TESTBIT(fFlags, kUseCentralPixel); }
     Bool_t IsUseInterpolation() const { return TESTBIT(fFlags, kUseInterpolation); }

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -71 +71 @@
     virtual Int_t AddFile(const char *fname, Int_t entries=-1);
     virtual Int_t AddFiles(const MReadTree &read);
+    Int_t AddFiles(MDirIter &dir) { return MRead::AddFiles(dir); }
 
     Int_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -775 +775 @@
 // --------------------------------------------------------------------------
 //
+// cd into file. See TFile::cd()
+//
+Bool_t MWriteRootFile::cd(const char *path)
+{
+    return fOut->cd(path);
+}
+
+// --------------------------------------------------------------------------
+//
 // Implementation of SavePrimitive. Used to write the call to a constructor
 // to a macro. In the original root implementation it is used to write

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -128 +128 @@
     void Print(Option_t *t=NULL) const;
 
+    Bool_t cd(const char *path=0);
+
     ClassDef(MWriteRootFile, 1) // Task to write data into a root file
 };