Changeset 4967


Ignore:
Timestamp:
09/13/04 10:23:06 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r4966 r4967  
    7474   * mtrigger/MTrigger*.[h,cc]:
    7575     - updated class description and title
     76
     77   * mcalib/MCalibrationCam.h:
     78     - removed -> from fPixels, fAverageArea/Sectors
     79
     80   * mcalib/MCalibrationChargeCalc.cc:
     81     - small changes to output
     82     - simplification of an if-else block
     83
     84   * mcalib/MCalibrationIntensityCam.cc:
     85     - removed double deletion of fCams - caused a crash
     86
     87   * mcalib/MCalibrationIntensityCam.h:
     88     - removed -> from fCams
     89
     90   * mcalib/MCalibration*.h:
     91     - removed some obsolete (empty) destructors
     92
    7693
    7794

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

    r4905 r4967  
    115115  //
    116116  // delete fPixels should delete all Objects stored inside
    117   // 
     117  //
    118118  if (fPixels)
    119119    delete fPixels;

  • trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

    r4905 r4967  
    4444  PulserColor_t fPulserColor;        // Colour of the pulsed LEDs
    4545
    46   TClonesArray *fPixels;             //-> Array of MCalibrationPix, one per pixel
    47   TClonesArray *fAverageAreas;       //-> Array of MCalibrationPix, one per pixel area
    48   TClonesArray *fAverageSectors;     //-> Array of MCalibrationPix, one per camera sector
     46  TClonesArray *fPixels;             // Array of MCalibrationPix, one per pixel
     47  TClonesArray *fAverageAreas;       // Array of MCalibrationPix, one per pixel area
     48  TClonesArray *fAverageSectors;     // Array of MCalibrationPix, one per camera sector
    4949  TClonesArray *fAverageBadAreas;    //-> Array of MBadPixelsPix,   one per pixel area
    5050  TClonesArray *fAverageBadSectors;  //-> Array of MBadPixelsPix,   one per camera sector

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

    r4882 r4967  
    8181}
    8282
    83 
    8483// --------------------------------------
    8584//

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

    r4882 r4967  
    140140
    141141}
    142 
    143142
    144143// ------------------------------------------------------------------------

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

    r4948 r4967  
    551551  // The pattern has changed, we have to initialize everything new!!!
    552552  //
    553   *fLog << inf << " New pulser pattern: " ;
     553  *fLog << inf << GetDescriptor() << "- New pulser pattern: " ;
    554554  for (Int_t i=16; i>= 0; i--)
    555555    *fLog << (pattern >> i & 1);
    … …  
    562562  fPulserColor = MCalibrationCam::kNONE;
    563563 
    564   if (fPulserPattern & kAnyGreen )
    565     fPulserColor = MCalibrationCam::kGREEN;
    566  
    567   if (fPulserPattern & kAnyBlue )
    568     if (fPulserColor != MCalibrationCam::kNONE)
    569       {
    570         *fLog << err << GetDescriptor()
    571               << "Multiple colours used simultaneously in calibration file. Will skip this part!" << endl;
    572         return kCONTINUE;
    573       }
    574     else
    575       fPulserColor = MCalibrationCam::kBLUE;
    576  
    577   if (fPulserPattern & kAnyUV )
    578     if (fPulserColor != MCalibrationCam::kNONE)
    579       {
    580         *fLog << err << GetDescriptor()
    581               << "Multiple colours used simultaneously in calibration file. Will skip this part!" << endl;
    582         return kCONTINUE;
    583       }
    584     else
    585       fPulserColor = MCalibrationCam::kUV;
    586  
    587   if (fPulserPattern & kCT1Pulser )
    588     if (fPulserColor != MCalibrationCam::kNONE)
    589       {
    590         *fLog << err << GetDescriptor()
    591               << "Multiple colours used simultaneously in calibration file. Will skip this part!" << endl;
    592         return kCONTINUE;
    593       }
    594     else
    595       fPulserColor = MCalibrationCam::kCT1;
    596  
    597   *fLog << inf << GetDescriptor() << ": Found new colour ... " << flush;
     564  if (fPulserPattern & kAnyGreen)
     565      fPulserColor = MCalibrationCam::kGREEN;
     566
     567  if ((fPulserPattern & kAnyBlue ||
     568       fPulserPattern & kAnyUV   ||
     569       fPulserPattern & kCT1Pulser) && fPulserColor != MCalibrationCam::kNONE)
     570  {
     571      *fLog << err << "Multiple colours used simultaneously in calibration file. Will skip this part!" << endl;
     572      return kCONTINUE;
     573  }
     574
     575  if (fPulserColor == MCalibrationCam::kNONE)
     576  {
     577      if (fPulserPattern & kAnyBlue)
     578          fPulserColor = MCalibrationCam::kBLUE;
     579      if (fPulserPattern & kAnyUV)
     580          fPulserColor = MCalibrationCam::kUV;
     581      if (fPulserPattern & kCT1Pulser)
     582          fPulserColor = MCalibrationCam::kCT1;
     583  }
     584
     585  *fLog << inf << "Found new colour ... " << flush;
    598586 
    599587  switch (fPulserColor)

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

    r4882 r4967  
    136136}
    137137
    138 
    139138// --------------------------------------
    140139//

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

    r4911 r4967  
    5050
    5151using namespace std;
     52
    5253// --------------------------------------------------------------------------
    5354//
    … …  
    7273MCalibrationIntensityCam::~MCalibrationIntensityCam()
    7374{
    74   if (fCams)
    75     delete fCams;
     75    if (fCams)
     76        delete fCams;
    7677}
    7778

  • trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.h

    r4899 r4967  
    3333protected: 
    3434
    35   TClonesArray *fCams;        //-> Array of MCalibrationCams, one per pulse colour and intensity
     35  TClonesArray *fCams;        // Array of MCalibrationCams, one per pulse colour and intensity
    3636
    3737public:

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

    r4899 r4967  
    4646
    4747using namespace std;
     48
    4849// --------------------------------------------------------------------------
    4950//
    … …  
    5455// Creates a TClonesArray of MCalibrationChargeCam containers, initialized to 1 entry, destinated
    5556// to hold one container per camera.
    56 //
    57 // Calls:
    58 // - Clear()
    5957//
    6058MCalibrationIntensityChargeCam::MCalibrationIntensityChargeCam(const char *name, const char *title)
    … …  
    6765 
    6866}
    69 

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

    r4899 r4967  
    5151// Sets all pointers to 0
    5252//
    53 // Creates a TClonesArray of MCalibrationQECam containers, initialized to 1 entry, destinated
    54 // to hold one container per camera.
    55 //
    56 // Calls:
    57 // - Clear()
     53// Creates a TClonesArray of MCalibrationQECam containers, initialized
     54// to 1 entry, destinated to hold one container per camera.
    5855//
    5956MCalibrationIntensityQECam::MCalibrationIntensityQECam(const char *name, const char *title)
    … …  
    6663
    6764}
    68 

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

    r4899 r4967  
    4545
    4646using namespace std;
     47
    4748// --------------------------------------------------------------------------
    4849//
    … …  
    5455// to hold one container per camera.
    5556//
    56 // Calls:
    57 // - Clear()
    5857//
    5958MCalibrationIntensityRelTimeCam::MCalibrationIntensityRelTimeCam(const char *name, const char *title)
    … …  
    6665
    6766}
    68 

  • trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.h

    r4882 r4967  
    3434
    3535  MCalibrationQECam(const char *name=NULL, const char *title=NULL);
    36   ~MCalibrationQECam() {}
    3736
    3837  void Clear( Option_t *o=""  );
Note: See TracChangeset for help on using the changeset viewer.