Changeset 6214
- Timestamp:
- 02/02/05 18:42:09 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r6212 r6214 54 54 * mjobs/MJCalibrateSignal.cc 55 55 - put a compiler warning about the default cal. to photo-electrons 56 57 * callisto.cc 58 - add new flag "--use-test" to enable the MJCalibTest facility 59 (default: not used) 56 60 57 61 -
trunk/MagicSoft/Mars/callisto.cc
r6031 r6214 19 19 #include "MJCalibration.h" 20 20 #include "MJCalibrateSignal.h" 21 #include "MJCalibTest.h" 21 22 22 23 using namespace std; … … 71 72 gLog << " --print-seq Print Sequence information" << endl; 72 73 gLog << " --print-files Print Files taken from Sequence" << endl; 73 gLog << " --print-only Do not excute anything except print" << endl; 74 gLog << " --print-only Do not execute anything except print" << endl; 75 gLog << " --use-test Apply cal. const. to the same cal. file (for testing)" << endl; 74 76 gLog << " --config=callisto.rc Resource file [default=callisto.rc]" << endl; 75 77 gLog << endl; … … 117 119 //const Bool_t kPrintFiles = arg.HasOnlyAndRemove("--print-files"); 118 120 //const Bool_t kPrintOnly = arg.HasOnlyAndRemove("--print-only"); 121 const Bool_t kUseTest = arg.HasOnlyAndRemove("--use-test"); 119 122 const Bool_t kDebugEnv = arg.HasOnlyAndRemove("--debug-env"); 120 123 const Bool_t kDebugMem = arg.HasOnlyAndRemove("--debug-mem"); … … 373 376 return 1; 374 377 } 378 MJCalibTest job4(Form("MJCalibTest #%d", seq.GetSequence())); 379 if (kUseTest) 380 { 381 job4.SetBadPixels(job3.GetBadPixels()); 382 job4.SetSequence(seq); 383 job4.SetEnv(kConfig); 384 job4.SetEnvDebug(kDebugEnv); 385 job4.SetDisplay(d);; 386 job4.SetOverwrite(kOverwrite); 387 job4.SetPathOut(kOutpathC); 388 job4.SetPathData(kInpathD); 389 // job4.SetPathIn(kInpathC); 390 391 if (!job4.ProcessFile(job1.GetPedestalCam())) 392 { 393 gLog << err << "Calculation of calibration failed." << endl << endl; 394 return -1; 395 } 396 397 if (!job4.GetDisplay()) 398 { 399 gLog << warn << "Display closed by user... execution aborted." << endl << endl; 400 return 1; 401 } 402 } 375 403 } 376 404 -
trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.h
r5098 r6214 71 71 72 72 TPaveText *fFitLegend; //! Some legend to display the fit results 73 TH1F *fHSinglePheFADCSlices; // !A histogram created and deleted only in Draw()74 TH1F *fHPedestalFADCSlices; // !A histogram created and deleted only in Draw()73 TH1F *fHSinglePheFADCSlices; // A histogram created and deleted only in Draw() 74 TH1F *fHPedestalFADCSlices; // A histogram created and deleted only in Draw() 75 75 76 76 // Fit -
trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc
r6203 r6214 130 130 const Axis_t MHCalibrationRelTimeCam::fgFirst = -4.975; 131 131 const Axis_t MHCalibrationRelTimeCam::fgLast = 10.025; 132 const Float_t MHCalibrationRelTimeCam::fgProbLimit = 0.0000000 1;132 const Float_t MHCalibrationRelTimeCam::fgProbLimit = 0.0000000001; 133 133 const TString MHCalibrationRelTimeCam::gsHistName = "RelTime"; 134 134 const TString MHCalibrationRelTimeCam::gsHistTitle = "Arr. Times";
Note:
See TracChangeset
for help on using the changeset viewer.