Changeset 6870 for trunk/MagicSoft

Timestamp:

03/21/05 13:32:33 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• callisto.rc (modified) (3 diffs)
• mbase/MLogHtml.cc (modified) (2 diffs)
• mhcalib/MHCalibrationPulseTimeCam.cc (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (6 diffs)
• mjobs/hilocalib_df46.root (added)
• msignal/calibration_weights_UV46.dat (added)
• msignal/cosmics_weights46.dat (added)

trunk/MagicSoft/Mars/Changelog

@@ -56 +56 @@
    * mjobs/MJStar.cc:
      - replaced MCerPhotEvt by MSignalCam
+
+   * msignal/cosmics_weights46.dat, msignal/calibration_weightsUV46.dat,
+     mjobs/hilocalib_df46.root:
+     - added
+
+  * mbase/MLogHtml.cc:
+     - fixed a bug in Underline which cause a crash if fOut==NULL
+     - output a message if file cannot be opened
+
+   * mhcalib/MHCalibrationPulseTimeCam.cc:
+     - for some output there was a replacement of pix.GetPixId()
+       by hist.GetName() <undocumented>
 
 
@@ -178 +190 @@
      - 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/callisto.rc

@@ -100 +100 @@
 # weights file depending on what you are extracting
 # -------------------------------------------------------------------------
-MJPedestalC2.ExtractSignal.WeightsFile:          msignal/calibration_weights_UV4.dat
-MJPedestalY2.ExtractSignal.WeightsFile:          msignal/cosmics_weights4.dat
-MJPedestalY3.ExtractSignal.WeightsFile:          msignal/cosmics_weights4.dat
-MJCalibration.ExtractSignal.WeightsFile:         msignal/calibration_weights_UV4.dat
-MJCalibrateSignal.ExtractSignal.WeightsFile:     msignal/cosmics_weights4.dat
-MJCalibrateSignal.ExtractInterlaced.WeightsFile: msignal/calibration_weights_UV4.dat
+MJPedestalC2.ExtractSignal.WeightsFile:          msignal/calibration_weights_UV46.dat
+MJPedestalY2.ExtractSignal.WeightsFile:          msignal/cosmics_weights46.dat
+MJPedestalY3.ExtractSignal.WeightsFile:          msignal/cosmics_weights46.dat
+MJCalibration.ExtractSignal.WeightsFile:         msignal/calibration_weights_UV46.dat
+MJCalibrateSignal.ExtractSignal.WeightsFile:     msignal/cosmics_weights46.dat
+MJCalibrateSignal.ExtractInterlaced.WeightsFile: msignal/calibration_weights_UV46.dat
 #MJCalibrateSignal.ExtractSignal.LoGainStretch:     1.5
 #MJCalibrateSignal.ExtractInterlaced.LoGainStretch: 1.5
@@ -203 +203 @@
 # Use this if you want to change the higain-vs. logain intercalibration
 # -------------------------------------------------------------------------
-#MJCalibration.HiLoCalibFile:    mjobs/hilocalib_df4.root
+#MJCalibration.HiLoCalibFile:    mjobs/hilocalib_df46.root
 #MJCalibration.HiLoCalibration:  yes
 
@@ -309 +309 @@
 #MJPedestalY2.PulsePosCheck: yes
 #MJPedestalY2.ExtractWinLeft:  2.5
-#MJPedestalY2.ExtractWinRight: 5.0
+#MJPedestalY2.ExtractWinRight: 4.5
 
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/MLogHtml.cc

@@ -47 +47 @@
         delete fOut;
         fOut = NULL;
+
+        cerr << "Cannot open file " << name << ": " << strerror(errno) << endl;
         return;
     }
@@ -81 +83 @@
 void MLogHtml::Underline()
 {
+    if (!fOut)
+        return;
+
     *fOut << "<u>";
     fUnderline = kTRUE;

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -547 +547 @@
     {
       *fLog << warn << GetDescriptor()
-            << ": Only overflow or underflow in hi-gain pixel: " << pix.GetPixId() << endl;
+            << ": Only overflow or underflow in hi-gain pixel: " << hist.GetName() << endl;
       return;
     }  

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -178 +178 @@
 const Int_t MJCalibration::gkThirdBlindPixelInstallation   = 43308;
 const TString MJCalibration::fgReferenceFile = "mjobs/calibrationref.rc";
-const TString MJCalibration::fgHiLoCalibFile = "mjobs/hilocalib_df4.root";
+const TString MJCalibration::fgHiLoCalibFile = "mjobs/hilocalib_df46.root";
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -33 +33 @@
 #include "MJPedestal.h"
 
+// C/C++ includes
+#include <fstream>
+
 // root classes
 #include <TF1.h>
@@ -86 +89 @@
 #include "MFTriggerPattern.h"
 
-#include <fstream>
-
 ClassImp(MJPedestal);
 
@@ -94 +95 @@
 const TString  MJPedestal::fgReferenceFile   = "mjobs/pedestalref.rc";
 const TString  MJPedestal::fgBadPixelsFile   = "mjobs/badpixels_0_559.rc";
-const Float_t  MJPedestal::fgExtractWinLeft  = 2.5;
-const Float_t  MJPedestal::fgExtractWinRight = 5.0;
+const Float_t  MJPedestal::fgExtractWinLeft  = 3.5;
+const Float_t  MJPedestal::fgExtractWinRight = 4.5;
+
 // --------------------------------------------------------------------------
 //
@@ -1291 +1293 @@
         // Get the ranges for the new extractor setting
         //
-        const Int_t newfirst = (Int_t)(meanpulsetime-fExtractWinLeft);
+        const Int_t newfirst = TMath::Nint(meanpulsetime-fExtractWinLeft);
         Int_t wshigain = fExtractor->InheritsFrom("MExtractTimeAndCharge") 
           ?  ((MExtractTimeAndCharge*)fExtractor)->GetWindowSizeHiGain()
@@ -1302 +1304 @@
           ? ((MExtractTimeAndCharge*)fExtractor)->GetWindowSizeLoGain()
           : 6;
-        if (wslogain > 6)
-          wslogain = 6;
-
-        const Int_t newlast  = (Int_t)(meanpulsetime+fExtractWinRight);
+        if (wslogain > 4)
+          wslogain = 4;
+
+        const Int_t newlast  = TMath::Nint(meanpulsetime+fExtractWinRight);
 
         *fLog << all << underline 
@@ -1331 +1333 @@
             *fLog << "Try to use a different extractor (e.g. with a window size of only 4 sl.) or:" << endl;
             *fLog << "Set the limit to a lower value (callisto.rc: line 329): " << endl;
-            *fLog << "    MJPedestalY2:ExtractWinRight: 5.0           " << endl;
+            *fLog << "    MJPedestalY2:ExtractWinRight: 4.5           " << endl;
             *fLog << "(ATTENTION, you will lose late cosmics pulses!)" << endl;
             *fLog << endl;