Changeset 4188

Timestamp:

05/26/04 10:24:44 (21 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MDirIter.h (modified) (1 diff)
• mimage/MNewImagePar.cc (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/05/26: Javier Rico
+
+   * mbase/MDirIter.h
+     - Add method to reset the internal TIter iterator 
+
+   * mjobs/MJCalibration.cc
+     - In FindColorReset method, reset the file iterator before looping
+
+   * mimage/MNewImagepar.cc
+     - Add output lines in Print(const MGeomCam &geom) method for 
+       fInnerLeakage1, fInnerLeakage2 and fInnerSize
 
  2004/05/25: Raquel de los Reyes and Thomas Bretz

trunk/MagicSoft/Mars/mbase/MDirIter.h

@@ -54 +54 @@
         fNext.Reset();
     }
+    void ResetIter() {fNext.Reset();}
 
     TString Next(Bool_t nocheck=kFALSE);

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -254 +254 @@
     *fLog << " - Leakage1       [1]   = " << fLeakage1             << endl;
     *fLog << " - Leakage2       [1]   = " << fLeakage2             << endl;
+    *fLog << " - InnerLeakage1  [1]   = " << fInnerLeakage1        << endl;
+    *fLog << " - InnerLeakage2  [1]   = " << fInnerLeakage2        << endl;
+    *fLog << " - InnerSize      [#]   = " << fInnerSize            << " CerPhot" << endl;
     *fLog << " - Conc           [1]   = " << fConc                 << " (ratio)" << endl;
     *fLog << " - Conc1          [1]   = " << fConc1                << " (ratio)" << endl;

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -703 +703 @@
   
   TString filenames;
+  ((MDirIter*)fRuns)->ResetIter();
 
   while (!(filenames=((MDirIter*)fRuns)->Next()).IsNull())