Ignore:
Timestamp:
02/23/04 06:30:30 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mcalib
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

    r3257 r3265  
    88#pragma link C++ class MCalibrateData+;
    99
    10 #pragma link C++ class MCalibrationPix+;
     10#pragma link C++ class MCalibrationChargePix+;
    1111#pragma link C++ class MCalibrationBlindPix+;
    1212#pragma link C++ class MCalibrationChargeCam+;
     
    1515
    1616#pragma link C++ class MHCalibrationBlindPixel+;
    17 #pragma link C++ class MHCalibrationPixel+;
    1817#pragma link C++ class MHCalibrationChargePix+;
    1918#pragma link C++ class MHCalibrationChargeHiGainPix+;
  • trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

    r3249 r3265  
    5252
    5353#include "MCalibrationChargeCam.h"
    54 #include "MCalibrationPix.h"
     54#include "MCalibrationChargePix.h"
    5555
    5656#include "MExtractedSignalCam.h"
     
    193193      if(fCalibrationMode!=kNone)
    194194        {
    195           MCalibrationPix &pix = (*fCalibrations)[pixidx];       
     195          MCalibrationChargePix &pix = (*fCalibrations)[pixidx];       
    196196         
    197197          if (!pix.IsChargeValid())
  • trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

    r3249 r3265  
    6161
    6262#include "MCalibrationChargeCam.h"
    63 #include "MCalibrationPix.h"
     63#include "MCalibrationChargePix.h"
    6464
    6565#include "MExtractedSignalCam.h"
     
    234234  if(fCalibrationMode!=kNone)
    235235  {
    236     MCalibrationPix &pix = (*fCalibrations)[pixidx];       
     236    MCalibrationChargePix &pix = (*fCalibrations)[pixidx];       
    237237         
    238238    if (!pix.IsChargeValid())
  • trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc

    r3249 r3265  
    4747#include "MParList.h"
    4848
    49 #include "MCalibrationPix.h"
     49#include "MCalibrationChargePix.h"
    5050#include "MCalibrationChargeCam.h"
    5151
     
    246246    for (int i=0; i<num; i++)
    247247    {
    248         MCalibrationPix &calpix = (*fCalCam)[i];
     248        MCalibrationChargePix &calpix = (*fCalCam)[i];
    249249
    250250        const Float_t factor = fADC2Phot*calpix.GetMeanConversionBlindPixelMethod();
  • trunk/MagicSoft/Mars/mcalib/Makefile

    r3257 r3265  
    4040           MCalibrateData.cc \
    4141           MCalibrationChargeCalc.cc \
    42            MCalibrationPix.cc  \
     42           MCalibrationChargePix.cc  \
    4343           MCalibrationBlindPix.cc  \
    4444           MCalibrationChargePINDiode.cc  \
    4545           MCalibrationChargeCam.cc \
    4646           MHCalibrationBlindPixel.cc \
    47            MHCalibrationPixel.cc \
    4847           MHCalibrationChargePix.cc \
    4948           MHCalibrationChargeHiGainPix.cc \
Note: See TracChangeset for help on using the changeset viewer.