Changeset 8425 for trunk/MagicSoft/Mars


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

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r8424 r8425  
    4343     - removed the obsolete definition of kItemsLegend
    4444
     45   * mbadpixels/MBadPixelsIntensityCam.cc, mcalib/MCalibrationIntensityCam.cc:
     46     - removed obsolete reference in comment to MCalibrationINtensityQECam
     47
     48   * mcalib/CalibLinkDef.h, mcalib/Makefile, mjobs/MJCalibrateSignal.cc:
     49     - removed obsolete MCalibrationIntensityQECam
     50
     51   * mcalib/MCalibCalcFromPast.[h,cc], mcalib/MCalibColorSteer.[h,cc],
     52     mcalib/MCalibrateData.[h,cc]:
     53     - replaced data member fIntensQE by fQECam
     54     - removed references to obsolete MCalibrationIntensityQECam
     55     - added some comments
     56
     57   * mcalib/MCalibrationChargeCalc.[h,cc]:
     58     - replaced references to fIntensQE by direct access to fQECam
     59     - adde some comments
     60     - removed data member fIntensQECam
     61
    4562
    4663

  • trunk/MagicSoft/Mars/NEWS

    r8418 r8425  
    2424     for further simplification
    2525
    26    - callisto: for simplification removed references to MBadPixelsIntensityCam,
    27      this also removes support for previously excluded pixels (TO BE FIXED)
     26   - callisto: for simplification removed references to MBadPixelsIntensityCam
     27     and MCalibrationIntensityQECam,
    2828
    2929   - callisto: Added the option to write an event movie. Please use

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsIntensityCam.cc

    r8140 r8425  
    2323\* ======================================================================== */
    2424/////////////////////////////////////////////////////////////////////////////
    25 //                                                               
    26 // MBadPixelsIntensityCam                                               
    27 //                                                               
    28 // Base class for intensity calibration results 
     25//
     26// MBadPixelsIntensityCam
     27//
     28// Base class for intensity calibration results
    2929//
    3030// Contains TClonesArrays for the following objects:
    31 // - fCams:  Array of classes derived from MBadPixelsCam, one entry 
     31// - fCams:  Array of classes derived from MBadPixelsCam, one entry
    3232//           per calibration camera result. Has to be created
    3333//
    34 // See also: MCalibrationIntensityChargeCam, MCalibrationIntensityQECam,
    35 //           MCalibrationIntensityRelTimeCam,
    36 //           MCalibrationCam, MCalibrationPix,
    37 //           MCalibrationQECam, MCalibrationQEPix,
    38 //           MHCalibrationChargePix, MHCalibrationChargeCam             
     34// See also: MCalibrationIntensityChargeCam, MCalibrationIntensityRelTimeCam,
     35//           MCalibrationCam, MCalibrationPix,
     36//           MHCalibrationChargePix, MHCalibrationChargeCam
    3937//           MCalibrationChargeBlindPix, MCalibrationChargePINDiode
    4038//

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

    r8408 r8425  
    2020#pragma link C++ class MCalibrationIntensityChargeCam+;
    2121#pragma link C++ class MCalibrationIntensityBlindCam+;
    22 #pragma link C++ class MCalibrationIntensityQECam+;
    2322#pragma link C++ class MCalibrationIntensityRelTimeCam+;
    2423#pragma link C++ class MCalibrationIntensityTestCam+;

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

    r8417 r8425  
    5959#include "MCalibrationIntensityChargeCam.h"
    6060#include "MCalibrationIntensityBlindCam.h"
    61 #include "MCalibrationIntensityQECam.h"
    6261//#include "MCalibrationIntensityRelTimeCam.h"
    6362
    6463#include "MBadPixelsCam.h"
    6564
     65#include "MCalibrationQECam.h"
     66#include "MCalibrationQEPix.h"
    6667#include "MCalibrationChargePix.h"
    6768#include "MCalibrationChargeCalc.h"
    … …  
    126127
    127128  //
    128   // Look for the MBadPixels Intensity Cam
     129  // Look for the MBadPixels Cam
    129130  //
    130131  fBadPixels = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam");
    … …  
    132133  {
    133134      *fLog << err << "MBadPixelsCam not found... abort." << endl;
     135      return kFALSE;
     136  }
     137
     138  //
     139  // Look for the MBadPixels Intensity Cam
     140  //
     141  fQECam = (MCalibrationQECam*)pList->FindObject("MCalibrationQECam");
     142  if (!fQECam)
     143  {
     144      *fLog << err << "MCalibrationQECam not found... abort." << endl;
    134145      return kFALSE;
    135146  }
    … …  
    160171
    161172    fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam");
    162     fIntensQE     = (MCalibrationIntensityQECam*)    pList->FindCreateObj("MCalibrationIntensityQECam");
    163 
    164173    if (!fIntensCharge)
    165174        return kFALSE;
    166     if (!fIntensQE)
    167         return kFALSE;
    168175
    169176    MCalibrationChargeCam *chargeinit = (MCalibrationChargeCam*)pList->FindObject("MCalibrationChargeCam");
    170     MCalibrationQECam     *qeinit     = (MCalibrationQECam*)    pList->FindObject("MCalibrationQECam");
    171177
    172178    if (chargeinit)
    … …  
    174180    else
    175181      *fLog << "Could not find initial MCalibrationChargeCam, cannot initialize intensity cam" << endl;
    176 
    177     if (qeinit)
    178       fIntensQE->SetCam(qeinit,0);
    179     else
    180       *fLog << "Could not find initial MCalibrationQECam, cannot initialize intensity cam" << endl;
    181182
    182183    if (!fChargeCalc)
    … …  
    386387  *fLog << "MBadPixelsCam...";
    387388  fBadPixels->Clear();  // FIXME:::::: MERGE PreExcl!!!!
     389  // IS IT REALLY NECESSARY?
     390
     391  *fLog << "MCalibrationQECam...";
     392  fQECam->Clear();
     393  fQECam->SetRunNumber(runnumber);
     394  // IS IT REALLY NECESSARY?
     395
     396  // IF SIMPLE ENOUGH, REMOVE THE FUNCTION!
    388397
    389398  if (fIntensCharge)
    … …  
    404413  }
    405414
    406   if (fIntensQE)
    407   {
    408       *fLog << "MCalibrationQECam...";
    409       MCalibrationCam *cold = fIntensQE->GetCam();
    410       fIntensQE->AddToList(Form("MCalibrationQECam%04d",fNumCam),*fGeom);
    411       fIntensQE->GetCam()->SetRunNumber(runnumber);
    412       if (cold)
    413           fIntensQE->DeleteOldCam(cold);
    414   }
    415415  if (fIntensBlind)
    416416  {

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

    r8417 r8425  
    1919class MCalibrationIntensityChargeCam;
    2020class MCalibrationIntensityBlindCam;
    21 class MCalibrationIntensityQECam;
     21class MCalibrationQECam;
    2222
    2323class MBadPixelsCam;
    … …  
    3434  MCalibrationIntensityChargeCam  *fIntensCharge;    //! Intensity Charge Cam (to be created)
    3535  MCalibrationIntensityBlindCam   *fIntensBlind;     //! Intensity Blind  Cam (to be created)
    36   MCalibrationIntensityQECam      *fIntensQE;        //! Intensity QE     Cam (to be created)
    3736
    38   MBadPixelsCam                   *fBadPixels;
     37  MCalibrationQECam               *fQECam;           //! QE Cam
     38  MBadPixelsCam                   *fBadPixels;       //! Bad Pixels Cam
    3939
    4040  MCalibrationChargeCalc          *fChargeCalc;      //! Charge Calibration Task

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

    r8417 r8425  
    5959#include "MCalibrationIntensityChargeCam.h"
    6060#include "MCalibrationIntensityBlindCam.h"
    61 #include "MCalibrationIntensityQECam.h"
    6261#include "MCalibrationIntensityRelTimeCam.h"
    6362
    6463#include "MCalibrationPattern.h"
     64#include "MCalibrationQECam.h"
    6565#include "MCalibrationChargeCam.h"
    6666#include "MCalibrationChargeCalc.h"
    … …  
    156156  if (pList->FindObject(AddSerialNumber("MHCalibrationChargeCam")))
    157157  {
    158 
    159     fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam");
    160     fIntensQE     = (MCalibrationIntensityQECam*)    pList->FindCreateObj("MCalibrationIntensityQECam");
    161 
    162     fChargeCalc   = (MCalibrationChargeCalc*)tlist->FindObject("MCalibrationChargeCalc");
    163 
    164     *fLog << inf << "Found MHCalibrationChargeCam ... " << flush;
    165 
    166     if (!fIntensCharge)
     158      *fLog << inf << "Found MHCalibrationChargeCam ... " << flush;
     159
     160      fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam");
     161      if (!fIntensCharge)
     162          return kFALSE;
     163
     164      fQECam = (MCalibrationQECam*)pList->FindCreateObj("MCalibrationQECam");
     165      if (!fQECam)
     166          return kFALSE;
     167
     168      fChargeCalc = (MCalibrationChargeCalc*)tlist->FindObject("MCalibrationChargeCalc");
     169      if (!fChargeCalc)
    167170      {
    168         *fLog << err << "Could not find nor create MCalibrationIntensityChargeCam abort... " << endl;
    169         return kFALSE;
    170       }
    171    
    172     if (!fIntensQE)
    173       {
    174         *fLog << err << "Could not find nor create MCalibrationIntensityQECam abort... " << endl;
    175         return kFALSE;
    176       }
    177    
    178     if (!fChargeCalc)
    179       {
    180         *fLog << err << "Could not find MCalibrationChargeCalc abort... " << endl;
    181         return kFALSE;
     171          *fLog << err << "Could not find MCalibrationChargeCalc abort... " << endl;
     172          return kFALSE;
    182173      }
    183174  }
    184      
     175
    185176  //
    186177  // Look for the MFillH name "FillRelTimeCam". In case yes, initialize the
    … …  
    327318
    328319  fBad->Clear(); // FIXME:::::: MERGE PreExcl!!!!
     320  fQECam->Clear();
    329321
    330322  if (fIntensCharge)
    … …  
    337329          return kFALSE;
    338330      *fLog << inf << "New MCalibrationChargeCam with name: " << cam->GetName() << endl;
    339     }
    340   if (fIntensQE)
    341     {
    342       fIntensQE->AddToList(Form("MCalibrationQECam%s",namep.Data()),*fGeom);
    343       *fLog << inf << "New MCalibrationQECam with: " << namep << endl;
    344331    }
    345332

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

    r8417 r8425  
    1919class MCalibrationIntensityChargeCam;
    2020class MCalibrationIntensityBlindCam;
    21 class MCalibrationIntensityQECam;
    2221class MCalibrationIntensityRelTimeCam;
     22class MCalibrationQECam;
    2323class MBadPixelsCam;
    2424
    … …  
    3232  MCalibrationIntensityChargeCam  *fIntensCharge;    //!
    3333  MCalibrationIntensityBlindCam   *fIntensBlind;     //! 
    34   MCalibrationIntensityQECam      *fIntensQE;        //!
    3534  MCalibrationIntensityRelTimeCam *fIntensRelTime;   //!
     35  MCalibrationQECam               *fQECam;           //!
    3636  MBadPixelsCam                   *fBad;             //!
    3737 

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

    r8408 r8425  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.66 2007-04-17 12:39:14 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.67 2007-04-20 11:48:08 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    118118#include "MCalibrationChargePix.h"
    119119 
    120 #include "MCalibrationIntensityQECam.h"
    121120#include "MCalibrationQECam.h"
    122121#include "MCalibrationQEPix.h"
    … …  
    157156MCalibrateData::MCalibrateData(CalibrationMode_t calmode,const char *name, const char *title)
    158157    : fGeomCam(NULL),   fBadPixels(NULL), fCalibrations(NULL), fIntensCalib(NULL),
    159       fQEs(NULL), fIntensQE(NULL), fSignals(NULL), fCerPhotEvt(NULL), fCalibConstCam(NULL),
     158      fQEs(NULL), fSignals(NULL), fCerPhotEvt(NULL), fCalibConstCam(NULL),
    160159    fPedestalFlag(kNo), fSignalType(kPhot), fRenormFactor(1.), fScaleFactor(1.)
    161160{
    … …  
    249248            return kFALSE;
    250249        }
    251 
    252         fIntensQE = (MCalibrationIntensityQECam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityQECam"));
    253         if (fIntensQE)
    254           *fLog << inf << "Found MCalibrationIntensityQECam ... " << endl;
    255250
    256251        fQEs = (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
    … …  
    370365    }
    371366
    372     const MCalibrationQECam *qecam = fIntensQE ? (MCalibrationQECam*)fIntensQE->GetCam() : fQEs;
    373     if(fCalibrationMode == kBlindPixel && !qecam->IsBlindPixelMethodValid())
     367    if(fCalibrationMode == kBlindPixel && !fQEs->IsBlindPixelMethodValid())
    374368    {
    375369        *fLog << warn << "Blind pixel calibration method not valid, switching to F-factor method" << endl;
    … …  
    377371    }
    378372
    379     if(fCalibrationMode == kPinDiode && !qecam->IsPINDiodeMethodValid())
     373    if(fCalibrationMode == kPinDiode && !fQEs->IsPINDiodeMethodValid())
    380374    {
    381375        *fLog << warn << "PIN diode calibration method not valid, switching to F-factor method" << endl;
    … …  
    383377    }
    384378
    385     if(fCalibrationMode == kCombined && !qecam->IsCombinedMethodValid())
     379    if(fCalibrationMode == kCombined && !fQEs->IsCombinedMethodValid())
    386380    {
    387381        *fLog << warn << "Combined calibration method not valid, switching to F-factor method" << endl;
    … …  
    520514
    521515    MCalibrationChargeCam *chargecam = NULL;
    522     MCalibrationQECam     *qecam     = NULL;
    523516    if (updatecam)
    524     {
    525517        chargecam = fCalibrations;
    526         qecam     = fQEs;
    527     }
    528518    else
    529     {
    530519        chargecam = fIntensCalib ? (MCalibrationChargeCam*)fIntensCalib->GetCam() : fCalibrations;
    531         qecam     = fIntensQE    ? (MCalibrationQECam*)    fIntensQE->GetCam()    : fQEs;
    532     }
    533520
    534521    //
    … …  
    569556            calibFFactor = pix.GetMeanFFactorFADC2Phot();
    570557           
    571             const MCalibrationQEPix &qe = (MCalibrationQEPix&)(*qecam)[pixidx];
     558            const MCalibrationQEPix &qe = (MCalibrationQEPix&)(*fQEs)[pixidx];
    572559
    573560            if (updatecam)

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

    r8408 r8425  
    2222
    2323class MCalibrationIntensityChargeCam;
    24 class MCalibrationIntensityQECam;
    2524
    2625class MCalibrateData : public MTask
    … …  
    6665  MCalibrationIntensityChargeCam *fIntensCalib;   //! Calibration constants from interlaced calib.
    6766  MCalibrationQECam              *fQEs;           //! Quantum efficiencies
    68   MCalibrationIntensityQECam     *fIntensQE;      //! Quantum efficiencies  from interlaced calib.
    6967  MExtractedSignalCam            *fSignals;       //! Integrated charge in FADCs counts
    7068  MSignalCam                     *fCerPhotEvt;    //! Cerenkov Photon Event used for calculation

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

    r8423 r8425  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.174 2007-04-20 08:55:18 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.175 2007-04-20 11:48:08 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    222222
    223223#include "MCalibrationIntensityChargeCam.h"
    224 #include "MCalibrationIntensityQECam.h"
    225224#include "MCalibrationIntensityBlindCam.h"
    226225
    … …  
    367366    fCam         = NULL;
    368367    fHCam        = NULL;
    369     fIntensQE    = NULL;
    370368    fQECam       = NULL;
    371369    fIntensBlind = NULL;
    … …  
    433431    }
    434432
     433  // Obsolete... it is already set in the constructor isn't it?
    435434  fPulserColor = MCalibrationCam::kNONE;
    436435
    … …  
    444443//  - MGeomCam
    445444// -  MCalibrationIntensityChargeCam or MCalibrationChargeCam
    446 //  - MCalibrationIntensityQECam or MCalibrationQECam
     445//  - MCalibrationQECam
    447446//  - MBadPixelsCam
    448447//
    … …  
    476475{
    477476
     477    //
     478    // Geometry
     479    //
    478480  fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
    479481  if (!fGeom)
    … …  
    482484      return kFALSE;
    483485    }
    484  
     486
     487    //
     488    // Charge histogram
     489    //
     490  fHCam = (MHCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MHCalibrationChargeCam"));
     491  if (!fHCam)
     492    {
     493      *fLog << err << "Cannot find MHCalibrationChargeCam ... abort." << endl;
     494      *fLog << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl;
     495      return kFALSE;
     496    }
     497 
     498    //
     499    // Intensity containers
     500    //
    485501  fIntensCam = (MCalibrationIntensityChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityChargeCam"));
    486502  if (fIntensCam)
    … …  
    497513    }
    498514 
    499   fHCam = (MHCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MHCalibrationChargeCam"));
    500   if (!fHCam)
    501     {
    502       *fLog << err << "Cannot find MHCalibrationChargeCam ... abort." << endl;
    503       *fLog << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl;
    504       return kFALSE;
    505     }
    506 
    507   fIntensQE = (MCalibrationIntensityQECam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityQECam"));
    508   if (fIntensQE)
    509     *fLog << inf << "Found MCalibrationIntensityQECam... " << flush;
    510   else
    511     {
    512       fQECam = (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
    513       if (!fQECam)
    514         {
    515           *fLog << err << "Cannot find MCalibrationQECam ... abort." << endl;
    516           *fLog << "Maybe you forget to call an MFillH for the MHCalibrationQECam before..." << endl;
    517           return kFALSE;
    518         }
    519     }
    520  
    521515  fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityBlindCam"));
    522516  if (fIntensBlind)
    … …  
    528522        *fLog << inf << "No MCalibrationBlindCam found... no Blind Pixel method!" << endl;
    529523    }
    530  
    531   fHBlindCam = (MHCalibrationChargeBlindCam*)pList->FindObject(AddSerialNumber("MHCalibrationChargeBlindCam")); 
    532   if (!fHBlindCam)
    533     *fLog << inf << "No MHCalibrationChargeBlindCam found... no Blind Pixel method!" << endl;
     524
     525    //
     526    // Required containers
     527    //
     528  fQECam = (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
     529  if (!fQECam)
     530  {
     531      *fLog << err << "Cannot find MCalibrationQECam ... abort." << endl;
     532      return kFALSE;
     533  }
    534534
    535535  fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
    … …  
    546546  if (!fPINDiode)
    547547    *fLog << inf << "No MCalibrationChargePINDiode found... no PIN Diode method!" << endl;
    548  
    549   MCalibrationQECam     *qecam     = fIntensQE     
    550     ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
     548
     549  fHBlindCam = (MHCalibrationChargeBlindCam*)pList->FindObject(AddSerialNumber("MHCalibrationChargeBlindCam"));
     550  if (!fHBlindCam)
     551    *fLog << inf << "No MHCalibrationChargeBlindCam found... no Blind Pixel method!" << endl;
     552
     553
     554  //
     555  // Further initialization
     556  //
    551557  MCalibrationChargeCam *chargecam = fIntensCam
    552558    ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
    553559
    554   UInt_t npixels    = fGeom->GetNumPixels();
     560  const UInt_t npixels = fGeom->GetNumPixels();
    555561 
    556562  for (UInt_t i=0; i<npixels; i++)
    557563    {
    558      
     564
    559565      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i];
    560       MCalibrationQEPix     &pqe = (MCalibrationQEPix&)    (*qecam)    [i];
    561       MBadPixelsPix         &bad = (*fBadPixels)[i];
    562      
    563       if (bad.IsBad())
    564         {
     566
     567      if ((*fBadPixels)[i].IsBad())
     568      {
     569          MCalibrationQEPix &pqe = (MCalibrationQEPix&)(*fQECam)[i];
    565570          pix.SetExcluded();
    566571          pqe.SetExcluded();
    567572          continue;
    568         }
    569      
     573      }
     574
    570575      if (IsDebug())
    571576        pix.SetDebug();
    … …  
    585590
    586591  const MCalibrationCam::PulserColor_t col = fCalibPattern->GetPulserColor();
     592
     593  //
     594  // If pulser color didn't change there is nothing to do
     595  //
    587596  const Float_t strength = fCalibPattern->GetPulserStrength();
    588597  const Float_t strdiff  = TMath::Abs(strength-fStrength);
    589 
    590598  if (col == fPulserColor && strdiff < 0.05 )
    591599    {
    … …  
    593601      return kTRUE;
    594602    }
    595  
     603
     604  //
     605  // If there is no color is nothing to do
     606  //
    596607  if (col == MCalibrationCam::kNONE)
    597608    return kTRUE;
    598  
    599609
    600610  //
    … …  
    627637        }
    628638    }
    629  
     639
     640  //
     641  // Keep pulser color and strength in mind and output some information
     642  //
    630643  fPulserColor = col;
    631644  fStrength    = strength;
    632645
    633646  *fLog << inf << "Found new colour ... " << flush;
    634  
     647
    635648  switch (col)
    636649    {
    … …  
    644657  *fLog << inf << " with strength: " << strength << endl;
    645658 
     659  //
     660  // Distribute new color to all containers
     661  //
    646662  fHCam->SetColor(col);
    647663  if (fHBlindCam)
    … …  
    660676    fPINDiode->SetColor(col);
    661677
     678  //
     679  // Reset number of processed events
     680  //
    662681  fNumProcessed = 0;
    663682 
    … …  
    738757
    739758  MCalibrationBlindCam  *blindcam  = fIntensBlind ? (MCalibrationBlindCam*) fIntensBlind->GetCam() : fBlindCam;
    740   MCalibrationQECam     *qecam     = fIntensQE    ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
    741759  MCalibrationChargeCam *chargecam = fIntensCam   ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
    742760
    … …  
    844862  // Finalize Blind Pixel
    845863  //
    846   qecam->SetBlindPixelMethodValid(FinalizeBlindCam());
     864  fQECam->SetBlindPixelMethodValid(FinalizeBlindCam());
    847865
    848866  //
    849867  // Finalize PIN Diode
    850868  //
    851   qecam->SetBlindPixelMethodValid(FinalizePINDiode());
     869  fQECam->SetBlindPixelMethodValid(FinalizePINDiode());
    852870
    853871  //
    … …  
    907925
    908926  chargecam->SetReadyToSave();
    909   qecam    ->SetReadyToSave();
     927  fQECam    ->SetReadyToSave();
    910928  fBadPixels->SetReadyToSave();
    911929
    … …  
    17201738    }
    17211739 
    1722   MCalibrationQECam     *qecam     = fIntensQE     
    1723     ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
    17241740  MCalibrationChargeCam *chargecam = fIntensCam
    17251741    ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
    17261742
    17271743  MCalibrationChargePix &avpix = (MCalibrationChargePix&)chargecam->GetAverageArea(0);
    1728   MCalibrationQEPix     &qepix = (MCalibrationQEPix&)    qecam->GetAverageArea(0);
     1744  MCalibrationQEPix     &qepix = (MCalibrationQEPix&)    fQECam->GetAverageArea(0);
    17291745
    17301746  if (IsDebug())
    … …  
    17381754                           / qepix.GetPMTCollectionEff()
    17391755                           / qepix.GetLightGuidesEff(fPulserColor)
    1740                            / qecam->GetPlexiglassQE();
     1756                           / fQECam->GetPlexiglassQE();
    17411757
    17421758  const Float_t avphotrelvar = ( IsUseExternalNumPhes()
    … …  
    17461762                            + qepix.GetPMTCollectionEffRelVar()
    17471763                            + qepix.GetLightGuidesEffRelVar(fPulserColor)
    1748                             + qecam->GetPlexiglassQERelVar();
     1764                            + fQECam->GetPlexiglassQERelVar();
    17491765
    17501766  const UInt_t nareas   = fGeom->GetNumAreas();
    … …  
    17721788     
    17731789      MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*chargecam)[i];
    1774       MCalibrationQEPix     &qpix  = (MCalibrationQEPix&)    (*qecam)    [i];
     1790      MCalibrationQEPix     &qpix  = (MCalibrationQEPix&)    (*fQECam)   [i];
    17751791
    17761792      MBadPixelsPix &bad = (*fBadPixels)[i];
    … …  
    17881804      qpix.SetFFactorMethodValid(  kTRUE   , fPulserColor );
    17891805
    1790       if (!qpix.UpdateFFactorMethod( qecam->GetPlexiglassQE() ))
     1806      if (!qpix.UpdateFFactorMethod( fQECam->GetPlexiglassQE() ))
    17911807        *fLog << warn << GetDescriptor()
    17921808              << ": Cannot update Quantum efficiencies with the F-Factor Method" << endl;
    … …  
    19171933     
    19181934      MCalibrationChargePix &pix  = (MCalibrationChargePix&)(*chargecam)[i];
    1919       MCalibrationQEPix     &qpix = (MCalibrationQEPix&)    (*qecam)    [i];
     1935      MCalibrationQEPix     &qpix = (MCalibrationQEPix&)    (*fQECam)   [i];
    19201936
    19211937      if ((*fBadPixels)[i].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
    … …  
    19531969  MCalibrationBlindCam  *blindcam  = fIntensBlind
    19541970    ? (MCalibrationBlindCam*) fIntensBlind->GetCam(): fBlindCam;
    1955   MCalibrationQECam     *qecam     = fIntensQE     
    1956     ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
    19571971  MCalibrationChargeCam *chargecam = fIntensCam
    19581972    ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
    … …  
    19681982 
    19691983      const Float_t photons = blindcam->GetFluxInsidePlexiglass() * (*fGeom)[0].GetA()
    1970                            / qecam->GetPlexiglassQE();
     1984                           / fQECam->GetPlexiglassQE();
    19711985      chargecam->SetNumPhotonsBlindPixelMethod(photons);
    19721986         
    19731987      const Float_t photrelvar = blindcam->GetFluxInsidePlexiglassRelVar()
    1974                               + qecam->GetPlexiglassQERelVar();
     1988                              + fQECam->GetPlexiglassQERelVar();
    19751989 
    19761990      if (photrelvar > 0.)
    … …  
    19862000    {
    19872001     
    1988       MCalibrationQEPix     &qepix = (MCalibrationQEPix&)    (*qecam)    [i];
     2002      MCalibrationQEPix &qepix = (MCalibrationQEPix&)(*fQECam)[i];
    19892003     
    19902004      if (!blindcam || !(blindcam->IsFluxInsidePlexiglassAvailable()))
    … …  
    20082022                             / blindcam->GetFluxInsidePlexiglass()
    20092023                             / geo.GetA()
    2010                              * qecam->GetPlexiglassQE();
     2024                             * fQECam->GetPlexiglassQE();
    20112025
    20122026      const Float_t qerelvar = blindcam->GetFluxInsidePlexiglassRelVar()
    2013                                + qecam->GetPlexiglassQERelVar()
     2027                               + fQECam->GetPlexiglassQERelVar()
    20142028                               + pix.GetPheFFactorMethodRelVar();
    20152029
    … …  
    20182032      qepix.SetBlindPixelMethodValid(  kTRUE   , fPulserColor );
    20192033
    2020       if (!qepix.UpdateBlindPixelMethod( qecam->GetPlexiglassQE()))
     2034      if (!qepix.UpdateBlindPixelMethod( fQECam->GetPlexiglassQE()))
    20212035        *fLog << warn << GetDescriptor()
    20222036              << ": Cannot update Quantum efficiencies with the Blind Pixel Method" << endl;
    … …  
    20462060  const UInt_t npixels  = fGeom->GetNumPixels();
    20472061
    2048   MCalibrationQECam     *qecam     = fIntensQE     
    2049     ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
    20502062  MCalibrationChargeCam *chargecam = fIntensCam
    20512063    ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
    … …  
    20612073    {
    20622074     
    2063       MCalibrationQEPix     &qepix = (MCalibrationQEPix&)    (*qecam)    [i];
     2075      MCalibrationQEPix &qepix = (MCalibrationQEPix&)(*fQECam)[i];
    20642076
    20652077      if (!fPINDiode)
    … …  
    21132125  const UInt_t npixels  = fGeom->GetNumPixels();
    21142126
    2115   MCalibrationQECam     *qecam     = fIntensQE     
    2116     ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
    2117 
    21182127  for (UInt_t i=0; i<npixels; i++)
    21192128    {
    21202129     
    2121       MCalibrationQEPix     &qepix = (MCalibrationQEPix&)    (*qecam)    [i];
     2130      MCalibrationQEPix &qepix = (MCalibrationQEPix&)(*fQECam)[i];
    21222131
    21232132      if (!(*fBadPixels)[i].IsUnsuitable (MBadPixelsPix::kUnsuitableRun))

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

    r8417 r8425  
    2929class MCalibrationChargeCam;
    3030class MHCalibrationChargeCam;
    31 class MCalibrationIntensityQECam;
    3231class MCalibrationQECam;
    3332class MGeomCam;
    … …  
    9392  MHCalibrationChargeBlindCam    *fHBlindCam;      //!  Charges histograms of the Blind Pixels 
    9493  MCalibrationChargePINDiode     *fPINDiode;       //!  Calibrated Charges of the PIN Diode
    95   MCalibrationIntensityQECam     *fIntensQE;       //!  Intensity Calibration Quantum Efficiencies of all pixels
    9694  MCalibrationQECam              *fQECam;          //!  Calibrated Quantum Efficiencies of all pixels
    9795  MGeomCam                       *fGeom;           //!  Camera geometry

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

    r8140 r8425  
    3434//           per calibration camera result and area index
    3535//
    36 // See also: MCalibrationIntensityChargeCam, MCalibrationIntensityQECam,
    37 //           MCalibrationIntensityRelTimeCam,
    38 //           MCalibrationCam, MCalibrationPix,
    39 //           MCalibrationQECam, MCalibrationQEPix,
    40 //           MHCalibrationChargePix, MHCalibrationChargeCam             
    41 //           MCalibrationChargeBlindPix, MCalibrationChargePINDiode
     36// See also: MCalibrationIntensityChargeCam, MCalibrationIntensityRelTimeCam,
     37//           MCalibrationCam, MCalibrationPix, MHCalibrationChargePix,
     38//           MHCalibrationChargeCam, MCalibrationChargeBlindPix,
     39//           MCalibrationChargePINDiode
    4240//
    4341// Inline Functions:

  • trunk/MagicSoft/Mars/mcalib/Makefile

    r8408 r8425  
    4242           MCalibrationIntensityChargeCam.cc \
    4343           MCalibrationIntensityBlindCam.cc \
    44            MCalibrationIntensityQECam.cc \
    4544           MCalibrationIntensityRelTimeCam.cc \
    4645           MCalibrationIntensityTestCam.cc \

  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r8418 r8425  
    7272#include "MCalibrationIntensityBlindCam.h"
    7373#include "MCalibrationIntensityRelTimeCam.h"
    74 #include "MCalibrationIntensityQECam.h"
    7574
    7675#include "MHCalibrationChargeCam.h"
    … …  
    257256    // Read File
    258257    MCalibrationIntensityChargeCam      ichcam;
    259     MCalibrationIntensityQECam          iqecam;
    260258    MCalibrationIntensityBlindCam       iblcam;
    261259    MCalibrationIntensityRelTimeCam     itmcam;
    … …  
    286284    {
    287285        interlacedcont.Add(&ichcam);
    288         interlacedcont.Add(&iqecam);
    289286        interlacedcont.Add(&iblcam);
    290287        interlacedcont.Add(&itmcam);
Note: See TracChangeset for help on using the changeset viewer.