Changeset 7292 for trunk


Ignore:
Timestamp:
08/18/05 15:43:16 (19 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r7288 r7292  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20 2005/08/18
     21
     22   * RELEASE 0.9.4.1
     23
     24
     25
    2026 2005/08/17 Thomas Bretz
    2127

  • trunk/MagicSoft/Mars/Makefile.conf.general

    r7267 r7292  
    1818#   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
    1919#
    20 DEFINES  = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
     20DEFINES  = -DMARSVER=\"0.9.4.1\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
    2121
    2222CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)

  • trunk/MagicSoft/Mars/NEWS

    r7288 r7292  
    11                                                               -*-*- END -*-*-
    22
    3  *** Version <cvs>
     3 *** Version 0.9.4.1 (2005/08/18)
    44
    55   - callisto: fixed some problems with the calibration in case of
    … …  
    1717
    1818
    19  *** Version 0.9.3 (2005/08/05)
     19 *** Version 0.9.4 (2005/08/05)
    2020
    2121   - general: Fixed the ZA binning. It didn't correctyl fit the

  • trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

    r7288 r7292  
    240240      }
    241241  }
    242      
     242
    243243  fNumCam    = 0;
    244244  fNumEvents = 0;
    … …  
    287287Int_t MCalibCalcFromPast::Process()
    288288{
    289 
    290289  if (fNumEvents++ < fNumEventsDump)
    291290    return kTRUE;
    292  
     291
    293292  fNumEvents = 0;
    294293  ReInitialize();
    … …  
    313312        {
    314313            fNumFails++;
    315             *fLog << warn << "WARNING - Finalization of charges failed the " << fNumFails << " time..." << endl;
     314            *fLog << warn << "WARNING - Finalization of charges failed the " << fNumFails << ". time..." << endl;
    316315        }
    317316

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

    r7190 r7292  
    739739      }
    740740
    741   MCalibrationBlindCam  *blindcam  = fIntensBlind   
    742     ? (MCalibrationBlindCam*)fIntensBlind->GetCam() : fBlindCam;
    743   MCalibrationQECam     *qecam     = fIntensQE     
    744     ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
    745   MCalibrationChargeCam *chargecam = fIntensCam
    746     ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
    747   MBadPixelsCam         *badcam    = fIntensBad
    748     ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
     741  MCalibrationBlindCam  *blindcam  = fIntensBlind ? (MCalibrationBlindCam*) fIntensBlind->GetCam() : fBlindCam;
     742  MCalibrationQECam     *qecam     = fIntensQE    ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
     743  MCalibrationChargeCam *chargecam = fIntensCam   ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
     744  MBadPixelsCam         *badcam    = fIntensBad   ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
    749745
    750746  //
Note: See TracChangeset for help on using the changeset viewer.