Changeset 6872 for trunk/MagicSoft/Mars

Timestamp:

03/22/05 10:57:14 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (4 diffs)
• mjobs/MJCalibTest.cc (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (2 diffs)
• mjobs/MJPedestal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/03/22 Thomas Bretz
+
+   * mjobs/MJCalibTest.cc, mjobs/MJCalibrateSignal.cc,
+     mjobs/MJCalibration.cc, mjobs/MJPedestal.cc:
+     - added a possibility to print the files which are 
+       searched/found if the files doesn't match the sequence
+
+   * mjobs/MJPedestal.cc:
+     - undocumented(!) change, changed fgExtractWinLeft
+       from 3.5 to 2.5
+
+
+
  2005/03/21 Thomas Bretz
 
@@ -59 +72 @@
    * msignal/cosmics_weights46.dat, msignal/calibration_weightsUV46.dat,
      mjobs/hilocalib_df46.root:
-     - added
+     - added new intercalibration file for digital filter 4sl higain
+       and 6sl logian
 
   * mbase/MLogHtml.cc:
@@ -74 +88 @@
      - added new member function GetArea returning the area
        correspondig to an ellipse with axis lnegth and width
+
+
+
+ 2005/03/19 Markus Gaug
+ 
+   * mjobs/hilocalib_df46.root
+     - added new intercalibration file for digital filter 4sl higain 
+       and 6 slices logain
+
+   * mjobs/MJCalibration.cc
+      - exchanged intercalibration file from hilocalib_df_4.root to  
+        hilocalib_df46.root
+      - do not apply hi-gain lo-gain intercalibration for MC files.
+
+   * mjobs/MJPedestal.cc
+     - exchanged two (Int_t)'s by TMath::Nint().
+     - undocumented(!) change to the calculation of the extraction
+       range (PulsePosCheck)
+
+   * callisto.rc
+     - exchanged default weights file for Digital filter from
+       cosmics_weights4.dat to cosmics_weights46.dat and from 
+       calibration_weights_UV4.dat to calibration_weights_UV46.dat!
+       This change is absolutely necessary, given the new results from 
+       Nuria about the signal resolution in the low gain which gets worse
+       than the intrinsic Poisson jitter above 350 phes. Also the time
+       resolution is too bad. This was not known before we had the  
+       correct low-gain MC pulse.
 
 
@@ -196 +238 @@
      - removed MFSelStandard
      - removed MFSelFinal
-
-
-
- 2005/03/19 Markus Gaug
- 
-   * mjobs/hilocalib_df46.root
-     - added new intercalibration file for digital filter 4sl higain 
-       and 6 slices logain
-
-   * mjobs/MJCalibration.cc
-      - exchanged intercalibration file from hilocalib_df_4.root to  
-        hilocalib_df46.root
-
-   * mjobs/MJPedestal.cc
-     - exchanged two (Int_t)'s by TMath::Nint().
-     - undocumented(!) change to the calculation of the extraction
-       range (PulsePosCheck)
-
-   * callisto.rc
-     - exchanged default weights file for Digital filter from
-       cosmics_weights4.dat to cosmics_weights46.dat and from 
-       calibration_weights_UV4.dat to calibration_weights_UV46.dat!
-       This change is absolutely necessary, given the new results from 
-       Nuria about the signal resolution in the low gain which gets worse
-       than the intrinsic Poisson jitter above 350 phes. Also the time
-       resolution is too bad. This was not known before we had the  
-       correct low-gain MC pulse.
 
 

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -327 +327 @@
         {
           *fLog << err << "ERROR - Number of files found (" << n0 << ") doesn't match number of files in sequence (" << n1 << ")" << endl;
+            if (fLog->GetDebugLevel()>4)
+            {
+                *fLog << dbg << "Files which are searched:" << endl;
+                iter.Print("all");
+            }
           return kFALSE;
         }

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -327 +327 @@
           {
             *fLog << err << "ERROR - Number of files found (" << n0 << ") doesn't match number of files in sequence (" << n1 << ")" << endl;
+            if (fLog->GetDebugLevel()>4)
+            {
+                *fLog << dbg << "Files which are searched:" << endl;
+                iter.Print("all");
+            }
             return kFALSE;
           }

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1477 +1477 @@
 {
 
-  if (!fIsHiLoCalibration)
+  if (!fIsHiLoCalibration || IsUseMC())
     return kTRUE;
 
@@ -1763 +1763 @@
                   << n0 << ") doesn't match number of files in sequence (" 
                   << n1 << ")" << endl;
+            if (fLog->GetDebugLevel()>4)
+            {
+                *fLog << dbg << "Files which are searched:" << endl;
+                iter.Print("all");
+            }
             return kFALSE;
         }

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -95 +95 @@
 const TString  MJPedestal::fgReferenceFile   = "mjobs/pedestalref.rc";
 const TString  MJPedestal::fgBadPixelsFile   = "mjobs/badpixels_0_559.rc";
-const Float_t  MJPedestal::fgExtractWinLeft  = 3.5;
+const Float_t  MJPedestal::fgExtractWinLeft  = 2.5;
 const Float_t  MJPedestal::fgExtractWinRight = 4.5;
 
@@ -976 +976 @@
         {
             *fLog << err << "ERROR - Number of " << type << " files found (" << n0 << ") in " << (fPathData.IsNull()?"<default>":fPathData.Data())  << " doesn't match number of files in sequence (" << n1 << ")" << endl;
+            if (fLog->GetDebugLevel()>4)
+            {
+                *fLog << dbg << "Files which are searched:" << endl;
+                iter.Print("all");
+            }
             return kFALSE;
         }