Changeset 6887

Timestamp:

03/24/05 11:14:13 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (2 diffs)
• mjobs/hilocalib_df46.root (modified) ( previous)
• mjobs/hilocalib_df46_mc.root (added)
• msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/03/23 Markus Gaug
+
+   * msignal/MExtractTimeAndChargeDigitalFilter.cc
+     - fix a bug in the time fine adjustment
+
+   * mjobs/hilocalib_*_mc.root
+     - high-gain low-gain intercalibration constants for the MC.
+
+   * mjobs/MJCalibration.cc
+     - use the MC- intercalibration files for MC.
+
+
+
+ 2005/03/23 Thomas Bretz
+
+   * mhcalib/MHCalibrationChargeCam.cc:
+     - fixed a possible crash in DrawDataCheckPixel() if 
+       pix.GetGraphEvents() returns NULL
+
+
+
  2005/03/23 Thomas Bretz
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1477 +1477 @@
 {
 
-  if (!fIsHiLoCalibration || IsUseMC())
+  if (!fIsHiLoCalibration)
     return kTRUE;
 
@@ -1582 +1582 @@
 
     fHiLoCalibFile = GetEnv("HiLoCalibFile",fHiLoCalibFile.Data());
+
+    if (IsUseMC() && !fHiLoCalibFile.EndsWith("_mc.root"))
+    {
+        if (!fHiLoCalibFile.EndsWith(".root"))
+        {
+            *fLog << warn << "WARNING - Hi-/Lo-Gain intercalibration file ";
+            *fLog << fHiLoCalibFile << " has not .root as extension..." << endl;
+        }
+        else
+            fHiLoCalibFile.Insert(fHiLoCalibFile.Length()-5, "_mc");
+    }
 
     return ReadHiLoCalibFile();

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -406 +406 @@
   const Float_t timefineadjust = time_sum/sum;
   
-  if (timefineadjust < 2./fBinningResolutionHiGain)
+  if (TMath::Abs(timefineadjust) < 4./fBinningResolutionHiGain)
     time -= timefineadjust;
 
@@ -542 +542 @@
   const Float_t timefineadjust = time_sum/sum;
   
-  if (timefineadjust < 2./fBinningResolutionLoGain)
+  if (TMath::Abs(timefineadjust) < 4./fBinningResolutionLoGain)
     time -= timefineadjust;