Changeset 8276 for trunk/MagicSoft

Timestamp:

01/29/07 12:53:10 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfbase/MFDataPhrase.cc (modified) (1 diff)
• mmain/MEventDisplay.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -37 +37 @@
      - removed badpixel calculation and treatment until a better
        solution was found.
+
+   * mfbase/MFDataPhrase.cc:
+     - fixed a "comparison is always true" warning
 
 

trunk/MagicSoft/Mars/mfbase/MFDataPhrase.cc

@@ -273 +273 @@
 Int_t MFDataPhrase::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
-    Bool_t rc = MFilter::ReadEnv(env, prefix, print);
+    Int_t rc = MFilter::ReadEnv(env, prefix, print);
     if (rc==kERROR)
         return kERROR;

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.56 2006-11-02 17:44:09 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.57 2007-01-29 12:51:17 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -308 +308 @@
 
         MPedestalSubtract *pedsub = new MPedestalSubtract;
+        pedsub->SetNamePedestalCam();
         //MCalibrationRelTimeCalc *tcalc = new MCalibrationRelTimeCalc;
 
@@ -328 +329 @@
         tlist->AddToList(calib);    // MExtractedSignalCam --> MSignalCam
 
-        tlist->AddToList(bcalc);    // Produce MBadPixelsCam
-        tlist->AddToList(btreat);   // Treat MBadPixelsCam
+        //tlist->AddToList(bcalc);    // Produce MBadPixelsCam
+        //tlist->AddToList(btreat);   // Treat MBadPixelsCam
     }