Changeset 6249 for trunk/MagicSoft/Mars/macros
- Timestamp:
- 02/04/05 10:49:46 (20 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/macros/calibration.C
r5942 r6249 69 69 #include "MJPedestal.h" 70 70 #include "MJCalibration.h" 71 #include "MJ ExtractCalibTest.h"72 #include "MJCalibrateSignal FromOutside.h"71 #include "MJCalibTest.h" 72 #include "MJCalibrateSignal.h" 73 73 #include "MRunIter.h" 74 74 #include "MStatusDisplay.h" … … 85 85 static TString outpath = "."; 86 86 //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"; 89 static TString inpath = "/home/rootdata/Calib/2004_09_21"; 89 90 static TString badfile; 90 91 //static TString badfile = "badpixels_only0_388_559.dat"; … … 92 93 // the default pedestal run for the calibration 93 94 // 95 //static const Int_t pedrun = 43915; 94 96 static const Int_t pedrun = 38995; 95 97 // … … 130 132 // Tell if you want to test the result afterwards 131 133 // 132 static Bool_t useTest = k FALSE;134 static Bool_t useTest = kTRUE; 133 135 // 134 136 // Tell if you want to test the intensity calibration … … 147 149 // to the extractor-TDAS 148 150 // 149 static Int_t extractorflag = 3 3;151 static Int_t extractorflag = 34; 150 152 // 151 153 Int_t calibration(const UInt_t extflag=extractorflag, const Int_t prun=pedrun, … … 153 155 const Int_t drun1=datrun1, const Int_t drun2=datrun2) 154 156 { 157 158 cout << extractorflag << endl; 155 159 156 160 MExtractor *extractor = getExtractor(extflag==33 ? 32 : extflag); … … 329 333 { 330 334 331 MJ ExtractCalibTest testloop;335 MJCalibTest testloop; 332 336 333 337 // If you want to see the data-check plots only, choose: … … 341 345 testloop.SetBadPixels(calloop.GetBadPixels()); 342 346 343 if (!testloop.Process(pedloop1.GetPedestalCam(),calloop.GetCalibrationCam(),calloop.GetQECam(), 344 calloop.GetRelTimeCam())) 347 if (!testloop.ProcessFile(pedloop1.GetPedestalCam())) 345 348 return 3; 346 349 … … 368 371 } 369 372 370 MJCalibrateSignal FromOutsidecalibloop;371 372 calibloop.SetExtractor(extractor);373 MJCalibrateSignal calibloop; 374 375 // calibloop.SetExtractor(extractor); 373 376 calibloop.SetInput(&druns); 374 377 calibloop.SetPathOut(outpath); 375 378 if (useDisplay) 376 379 calibloop.SetDisplay(display); 377 calibloop.SetBadPixels(calloop.GetBadPixels());378 calibloop.SetNoStorage(!useStorage);380 // calibloop.SetBadPixels(calloop.GetBadPixels()); 381 // calibloop.SetNoStorage(!useStorage); 379 382 calibloop.SetInterlaced(useInterlaced); 380 383 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())) 382 387 return 5; 383 388 … … 390 395 if (debug) 391 396 gObjectTable->Print(); 392 393 397 394 398 return 0; … … 478 482 gLog << " and write out the pixels as ascii tables" << endl; 479 483 gLog << " --useInterlaced Use the program to calibrate data with the interlaced cal. events" << endl; 480 gLog << " --useTest Use the class MJ ExtractCalibTest to test the calibration on itself" << endl;484 gLog << " --useTest Use the class MJCalibTest to test the calibration on itself" << endl; 481 485 gLog << " --skipBlindPix Skip the blind pixel calibration" << endl; 482 486 gLog << " --skipPINDiode Skip the PIN Diode calibration" << endl;
Note:
See TracChangeset
for help on using the changeset viewer.