Changeset 4402


Ignore:
Timestamp:
07/16/04 14:11:19 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r4401 r4402  
    4646      camera
    4747
     48  * mcalib/MCalibrationChargeCalc.[h,cc]
     49    - adapted to use of various blind pixels
    4850
    4951 2004/07/15: Markus Gaug
  • trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

    r3980 r4402  
    2020#pragma link C++ class MCalibrationChargeCam+;
    2121#pragma link C++ class MCalibrationChargePix+;
     22#pragma link C++ class MCalibrationChargeBlindCam+;
    2223#pragma link C++ class MCalibrationChargeBlindPix+;
    2324#pragma link C++ class MCalibrationChargePINDiode+;
     
    2829#pragma link C++ class MHCalibrationChargeHiGainPix+;
    2930#pragma link C++ class MHCalibrationChargeLoGainPix+;
     31#pragma link C++ class MHCalibrationChargeBlindCam+;
    3032#pragma link C++ class MHCalibrationChargeBlindPix+;
    3133#pragma link C++ class MHCalibrationChargePINDiode+;
  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

    r4390 r4402  
    207207#include "MCalibrationChargePINDiode.h"
    208208#include "MCalibrationChargeBlindPix.h"
     209#include "MCalibrationChargeBlindCam.h"
    209210
    210211#include "MExtractedSignalCam.h"
     
    309310    fCam        = NULL;
    310311    fBlindPixel = NULL;
     312    fBlindCam   = NULL;
    311313    fPINDiode   = NULL;
    312314    fPedestals  = NULL;
     
    433435  if (!fBlindPixel)
    434436    {
     437      fBlindCam = (MCalibrationChargeBlindCam*)pList->FindObject("MCalibrationChargeBlindCam");
     438      if (!fBlindCam)
     439        {
    435440      *fLog << endl;
    436441      *fLog << warn << GetDescriptor()
    437             << ": MCalibrationChargeBlindPix not found... no Blind Pixel method! " << endl;
     442            << ": MCalibrationChargeBlindPix nor MCalibrationChargeBlindCam "
     443            << " found... no Blind Pixel method! " << endl;
     444        }
    438445    }
    439446 
     
    456463      if (fBlindPixel)
    457464        fBlindPixel->SetColor( fPulserColor );
     465     
     466      if (fBlindCam)
     467        fBlindCam->SetColor( fPulserColor );
    458468     
    459469      if (fPINDiode)
     
    477487        return kFALSE;
    478488      }
     489
     490  if (fBlindCam)
     491    if (fPulserColor != fBlindCam->GetColor())
     492      {
     493        *fLog << err << GetDescriptor()
     494              << ": Pulser colour has changed w.r.t. last file in MCalibrationChargeBlindCam." << endl;
     495        *fLog << err << "This feature is not yet implemented, sorry ... aborting " << endl;
     496        return kFALSE;
     497      }
    479498 
    480499  if (fPINDiode)
     
    577596              << ": MCalibrationChargeBlindPix is declared not valid... no Blind Pixel method! " << endl;
    578597        fBlindPixel = NULL;
     598      }
     599
     600  if (fBlindCam)
     601    if (!fBlindCam->IsValid())
     602      {
     603        *fLog << warn << GetDescriptor()
     604              << ": MCalibrationChargeBlindCam is declared not valid... no Blind Pixel method! " << endl;
     605        fBlindCam = NULL;
    579606      }
    580607 
     
    694721  if (fBlindPixel)
    695722    fBlindPixel->SetReadyToSave();
     723  if (fBlindCam)
     724    fBlindCam->SetReadyToSave();
    696725  if (fPINDiode)
    697726    fPINDiode->SetReadyToSave();
  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h

    r4390 r4402  
    3232class MPedestalPix;
    3333class MCalibrationChargePINDiode;
     34class MCalibrationChargeBlindCam;
    3435class MCalibrationChargeBlindPix;
    3536class MCalibrationChargePix;
     
    8283  MCalibrationChargeCam      *fCam;            //  Calibrated Charges of all pixels
    8384  MCalibrationChargeBlindPix *fBlindPixel;     //  Calibrated Charges of the Blind Pixel
     85  MCalibrationChargeBlindCam *fBlindCam;       //  Calibrated Charges of the Blind Pixels
    8486  MCalibrationChargePINDiode *fPINDiode;       //  Calibrated Charges of the PIN Diode
    8587  MCalibrationQECam          *fQECam;          //  Calibrated Quantum Efficiencies of all pixels
Note: See TracChangeset for help on using the changeset viewer.