Changeset 8458 for trunk

Timestamp:

04/27/07 15:19:59 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile.conf.general (modified) (1 diff)
• NEWS (modified) (1 diff)
• mbadpixels/MBadPixelsPix.h (modified) (1 diff)
• mcalib/MCalibrationRelTimeCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/04/27
+
+   * RELEASE 1.1
+
+
+
  2007/04/27 Daniel Hoehne
 

trunk/MagicSoft/Mars/Makefile.conf.general

@@ -17 +17 @@
 #   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
 #
-DEFINES  = -DMARSVER=\"\<cvs\>\" -D__MARS__ $(ARCHDEF) $(MARSDEFINES)
+DEFINES  = -DMARSVER=\"1.1\" -D__MARS__ $(ARCHDEF) $(MARSDEFINES)
 
 CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)

trunk/MagicSoft/Mars/NEWS

@@ -1 +1 @@
                                                                -*-*- END -*-*-
 
- *** <cvs>
+ *** Version  1.1 (2007/04/27)
 
    - general: The new class MGeomCamDwarf contains the camera geometry

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -116 +116 @@
       if (!IsUnreliable() || IsUnsuitable())      return 0;
       if (IsUncalibrated( kChargeSigmaNotValid )) return 1;
-      if (IsUncalibrated( kHiGainNotFitted     )) return 3;
-      if (IsUncalibrated( kLoGainNotFitted     )) return 4;
-      if (IsUncalibrated( kRelTimeNotFitted    )) return 5;
-      if (IsUncalibrated( kHiGainOscillating   )) return 6;
-      if (IsUncalibrated( kLoGainOscillating   )) return 7;
-      if (IsUncalibrated( kRelTimeOscillating  )) return 8;
-      if (IsUncalibrated( kDeviatingFFactor    )) return 9;
-      return 10;
+      if (IsUncalibrated( kHiGainNotFitted     )) return 2;
+      if (IsUncalibrated( kLoGainNotFitted     )) return 3;
+      if (IsUncalibrated( kRelTimeNotFitted    )) return 4;
+      if (IsUncalibrated( kHiGainOscillating   )) return 5;
+      if (IsUncalibrated( kLoGainOscillating   )) return 6;
+      if (IsUncalibrated( kRelTimeOscillating  )) return 7;
+      if (IsUncalibrated( kDeviatingFFactor    )) return 8;
+      return 9;
     }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -301 +301 @@
             if (res<0) //FIXME!!! How does this happen?
             {
-                *fLog << warn << "Pixel  " << setw(4) << i << ": Time resolution not calculated." << endl;
+                *fLog << warn << "Pixel  " << setw(4) << i << ": Time resolution could not be calculated." << endl;
                 (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingTimeResolution);
                 continue;