Changeset 5481

Timestamp:

11/27/04 13:16:28 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/Makefile (modified) (1 diff)
• mbadpixels/MBadPixelsPix.h (modified) (2 diffs)
• mcalib/MCalibColorSteer.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -81 +81 @@
    * mpedestal/MPedCalcFromLoGain.[h,cc]
      - derives from MExtractPedestal now 
+
+   * manalysis/Makefile
+     - removed inclusion of directory mhcalib/
 
  2004/11/23: Markus Gaug

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -21 +21 @@
 INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom -I../mfilter \
            -I../mdata -I../mhbase -I../mhist -I../mgui -I../mimage   \
-           -I../mhistmc -I../mfileio -I../mmain -I../mhcalib -I../mcalib \
+           -I../mhistmc -I../mfileio -I../mmain -I../mcalib \
            -I../msignal -I../mpointing -I../mtools -I../mfbase       \
            -I../mbadpixels -I../mastro -I../mpedestal -I../mtemp/mucm/classes

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -97 +97 @@
       if (IsUncalibrated( kMeanTimeInLast2Bins )) return 5;
       if (IsUncalibrated( kDeviatingNumPhes    )) return 6;
-      if (IsUncalibrated( kDeviatingFFactor    )) return 7;
-      if (IsUncalibrated( kDeviatingNumPhots   )) return 8;
-      if (IsUncalibrated( kHiGainOverFlow      )) return 9;
-      if (IsUncalibrated( kLoGainOverFlow      )) return 10;
-      return 11;
+      if (IsUncalibrated( kDeviatingNumPhots   )) return 7;
+      if (IsUncalibrated( kHiGainOverFlow      )) return 8;
+      if (IsUncalibrated( kLoGainOverFlow      )) return 9;
+      return 10;
     }
     
@@ -113 +112 @@
       if (IsUncalibrated( kLoGainOscillating   )) return 6;
       if (IsUncalibrated( kRelTimeOscillating  )) return 7;
-      return 8;
+      if (IsUncalibrated( kDeviatingFFactor    )) return 8;
+      return 9;
     }
     

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

@@ -62 +62 @@
 #include "MCalibrationRelTimeCalc.h"
 
+#include "MRawRunHeader.h"
 #include "MRawEvtHeader.h"
 
@@ -99 +100 @@
     {
       *fLog << err << "MRawEvtHeader not found... abort." << endl;
+      return kFALSE;
+    }
+
+  fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+  if (!fHeader)
+    {
+      *fLog << err << "MRawRunHeader not found... abort." << endl;
       return kFALSE;
     }