Changeset 5044


Ignore:
Timestamp:
09/15/04 20:18:04 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r5043 r5044  
    6161
    6262 2004/09/15: Markus Gaug
     63
     64   * mcalib/MCalibrationQEPix.[h,cc]
     65     - replaced TArrays by MArrays
     66     - added Copy function
    6367
    6468   * mcalib/MCalibration*Cam.[h,cc]

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

    r5019 r5044  
    3636  void   Clear ( Option_t *o="" );
    3737 
     38  // Clone
     39  TObject *Clone(const char *name="") const;
     40
    3841  // Draws
    3942  void   DrawPixelContent(Int_t num)   const;   

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

    r4882 r5044  
    4747#include "MCalibrationPedCam.h"
    4848
    49 #include <TClonesArray.h>
     49#include <TOrdCollection.h>
    5050
    5151#include "MLog.h"
    … …  
    8181    fName  = name  ? name  : "MCalibrationPedCam";
    8282    fTitle = title ? title : "Storage container for the Pedestal Calibration Results in the camera";
    83 
    84     fPixels           = new TClonesArray("MCalibrationPix",1);
    85     fAverageAreas     = new TClonesArray("MCalibrationPix",1);
    86     fAverageSectors   = new TClonesArray("MCalibrationPix",1);
    8783
    8884}

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

    r3651 r5044  
    88class MCalibrationPedCam : public MCalibrationCam
    99{
    10 private:
    11  
    12  
    1310public:
    1411

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

    r4882 r5044  
    240240}
    241241
     242// -----------------------------------------------------
     243//
     244// copy 'constructor'
     245//
     246void MCalibrationQEPix::Copy(TObject& object) const
     247{
     248
     249  MCalibrationQEPix &pix = (MCalibrationQEPix&)object;
     250
     251  MCalibrationPix::Copy(pix);
     252  //
     253  // Copy the rest of the data members
     254  //
     255  pix.fQEBlindPixel      = fQEBlindPixel;
     256  pix.fQEBlindPixelVar   = fQEBlindPixelVar;
     257  pix.fQECombined        = fQECombined;
     258  pix.fQECombinedVar     = fQECombinedVar;
     259  pix.fQEFFactor         = fQEFFactor;
     260  pix.fQEFFactorVar      = fQEFFactorVar;
     261  pix.fQEPINDiode        = fQEPINDiode;
     262  pix.fQEPINDiodeVar     = fQEPINDiodeVar;
     263                                     
     264  pix.fAvNormBlindPixel    = fAvNormBlindPixel;
     265  pix.fAvNormBlindPixelVar = fAvNormBlindPixelVar;
     266  pix.fAvNormCombined      = fAvNormCombined;
     267  pix.fAvNormCombinedVar   = fAvNormCombinedVar;
     268  pix.fAvNormFFactor       = fAvNormFFactor;
     269  pix.fAvNormFFactorVar    = fAvNormFFactorVar;
     270  pix.fAvNormPINDiode      = fAvNormPINDiode;
     271  pix.fAvNormPINDiodeVar   = fAvNormPINDiodeVar;
     272  pix.fAverageQE           = fAverageQE;
     273
     274  pix.fValidFlags          = fValidFlags;
     275  pix.fAvailableFlags      = fAvailableFlags;
     276 
     277}
     278
    242279// ----------------------------------------------------------------------------------------------
    243280//
Note: See TracChangeset for help on using the changeset viewer.