Ignore:
Timestamp:
02/04/05 10:49:46 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/macros/calibration.C

    r5942 r6249  
    6969#include "MJPedestal.h"
    7070#include "MJCalibration.h"
    71 #include "MJExtractCalibTest.h"
    72 #include "MJCalibrateSignalFromOutside.h"
     71#include "MJCalibTest.h"
     72#include "MJCalibrateSignal.h"
    7373#include "MRunIter.h"
    7474#include "MStatusDisplay.h"
     
    8585static TString outpath = ".";
    8686//static TString inpath  = "/home/rootdata/Calib/2004_07_06";
    87 //static TString inpath  = "/home/rootdata/Calib/2004_09_22";
    88 static TString inpath  = "/.magic/magicserv01/MAGIC/rootdata/2004_12_18";
     87//static TString inpath  = "/home/rootdata/Calib/2004_11_11";
     88//static TString inpath  = "/home/rootdata/Calib/2004_12_18";
     89static TString inpath  = "/home/rootdata/Calib/2004_09_21";
    8990static TString badfile;
    9091//static TString badfile = "badpixels_only0_388_559.dat";
     
    9293// the default pedestal run for the calibration
    9394//
     95//static const Int_t   pedrun  = 43915;
    9496static const Int_t   pedrun  = 38995;
    9597//
     
    130132// Tell if you want to test the result afterwards
    131133//
    132 static Bool_t useTest = kFALSE;
     134static Bool_t useTest = kTRUE;
    133135//
    134136// Tell if you want to test the intensity calibration
     
    147149// to the extractor-TDAS
    148150//
    149 static Int_t extractorflag = 33;
     151static Int_t extractorflag = 34;
    150152//
    151153Int_t calibration(const UInt_t extflag=extractorflag, const Int_t prun=pedrun,
     
    153155                  const Int_t drun1=datrun1, const Int_t drun2=datrun2)
    154156{
     157
     158  cout << extractorflag << endl;
    155159
    156160  MExtractor *extractor = getExtractor(extflag==33 ? 32 : extflag);
     
    329333    {
    330334     
    331       MJExtractCalibTest testloop;
     335      MJCalibTest testloop;
    332336     
    333337      // If you want to see the data-check plots only, choose:
     
    341345      testloop.SetBadPixels(calloop.GetBadPixels());
    342346     
    343       if (!testloop.Process(pedloop1.GetPedestalCam(),calloop.GetCalibrationCam(),calloop.GetQECam(),
    344                             calloop.GetRelTimeCam()))
     347      if (!testloop.ProcessFile(pedloop1.GetPedestalCam()))
    345348        return 3;
    346349     
     
    368371    }
    369372 
    370   MJCalibrateSignalFromOutside calibloop;
    371 
    372   calibloop.SetExtractor(extractor);
     373  MJCalibrateSignal calibloop;
     374
     375  //  calibloop.SetExtractor(extractor);
    373376  calibloop.SetInput(&druns);
    374377  calibloop.SetPathOut(outpath);
    375378  if (useDisplay)
    376379    calibloop.SetDisplay(display);
    377   calibloop.SetBadPixels(calloop.GetBadPixels());
    378   calibloop.SetNoStorage(!useStorage);
     380  //  calibloop.SetBadPixels(calloop.GetBadPixels());
     381  //  calibloop.SetNoStorage(!useStorage);
    379382  calibloop.SetInterlaced(useInterlaced);
    380383 
    381   if (!calibloop.ProcessFile(pedloop1.GetPedestalCam(),timeandcharge ? pedloop2.GetPedestalCam() : pedloop1.GetPedestalCam(), calloop.GetCalibrationCam(),calloop.GetQECam(), calloop.GetRelTimeCam()))
     384  if (!calibloop.ProcessFile(pedloop1.GetPedestalCam(),
     385                             timeandcharge ? pedloop2.GetPedestalCam() : pedloop1.GetPedestalCam(),
     386                             timeandcharge ? pedloop2.GetPedestalCam() : pedloop1.GetPedestalCam()))
    382387    return 5;
    383388
     
    390395  if (debug)
    391396    gObjectTable->Print();
    392 
    393397
    394398  return 0;
     
    478482    gLog << "                             and write out the pixels as ascii tables" << endl;
    479483    gLog << "     --useInterlaced     Use the program to calibrate data with the interlaced cal. events" << endl;
    480     gLog << "     --useTest           Use the class MJExtractCalibTest to test the calibration on itself" << endl;
     484    gLog << "     --useTest           Use the class MJCalibTest to test the calibration on itself" << endl;
    481485    gLog << "     --skipBlindPix      Skip the blind pixel calibration"             << endl;
    482486    gLog << "     --skipPINDiode      Skip the PIN Diode   calibration"             << endl;
Note: See TracChangeset for help on using the changeset viewer.