Changeset 5449 for trunk

Timestamp:

11/22/04 13:22:10 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (4 diffs)
• msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/11/22: Thomas Bretz
+
+   * msignal/MExtractTimeAndChargeDigitalFilter.cc:
+     - added check for \015 character in filename
+
+
+
  2004/11/22: Abelardo Moralejo
 
@@ -45 +52 @@
 
 
+
  2004/11/18: Hendrik Bartko
 
    * msignal/MC_weights_2GSamples.dat:
      - new weights file for MC simulations of the 2 GSamples FADCs
+
 
 
@@ -77 +86 @@
        padding 
 
-   * manalysis/Makefile
-               AnalysisLinkDef.h
+   * manalysis/Makefile, manalysis/AnalysisLinkDef.h
      - add MMakePadHistograms
 
@@ -84 +92 @@
      - add member function ReadPadHistograms()  
 
-   * mfilter/MFSelBasic.[h,cc]
-             MFSelStandard.[h,cc]
-             MFSelFinal.[h,cc]
+   * mfilter/MFSelBasic.[h,cc], mfilter/MFSelStandard.[h,cc],
+     mfilter/MFSelFinal.[h,cc]:
      - move printout of cut values from SetCuts() to PreProcess()
 
    * mimage/MImgCleanStd.[h,cc]
      - print name of MPedPhotCam container in PreProcess()
+
 
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -566 +566 @@
 Bool_t MExtractTimeAndChargeDigitalFilter::ReadWeightsFile(TString filename)
 {
+    // This is a fix for TEnv files edited with windows editors
+    filename.ReplaceAll("\015", "");
+
     fAmpWeightsHiGain .Set(fBinningResolutionHiGain*fWindowSizeHiGain);
     fAmpWeightsLoGain .Set(fBinningResolutionLoGain*fWindowSizeLoGain);
@@ -689 +692 @@
 
     *fLog << inf << " File contains " << fWindowSizeHiGain << " hi-gain slices ";
-    *fLog << "and with a resolution of " << fBinningResolutionHiGain << endl;
+    *fLog << "with a resolution of " << fBinningResolutionHiGain << endl;
 
     *fLog << inf << " File contains " << fWindowSizeLoGain << " lo-gain slices ";
-    *fLog << "and with a resolution of " << fBinningResolutionLoGain << endl;
+    *fLog << "with a resolution of " << fBinningResolutionLoGain << endl;
 
     return kTRUE;