Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 8413) +++ trunk/MagicSoft/Mars/Changelog (revision 8414) @@ -21,4 +21,8 @@ 2007/04/18 Thomas Bretz + * Makefile: + - added suffixes .hxx and .cxx + - added new subdir mmovie + * mjobs/Makefile: - added path to mmovie @@ -29,4 +33,11 @@ * mmovie/MMovieWrite.cc: - fixed some typos in comments + + * mjobs/MJCalibrateSignal.cc: + - removed dependenca on obsolete MCalibrationIntensityConstCam + + * mjobs/MJCalibration.[h,cc]: + - for simplification removed all dependencies of unused intensity + calibration Index: trunk/MagicSoft/Mars/NEWS =================================================================== --- trunk/MagicSoft/Mars/NEWS (revision 8413) +++ trunk/MagicSoft/Mars/NEWS (revision 8414) @@ -20,4 +20,7 @@ - callisto: Started further simplification by removing obsolete dependancies on MCalibIntensity*Cams. + + - callisto: removed unsused intensity calibration from MJCalibration + for further simplification - callisto: Added the option to write an event movie. Please use Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 8413) +++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 8414) @@ -68,9 +68,9 @@ #include "MCalibrationRelTimeCalc.h" +#include "MCalibConstCam.h" #include "MCalibrationIntensityChargeCam.h" #include "MCalibrationIntensityBlindCam.h" #include "MCalibrationIntensityRelTimeCam.h" #include "MCalibrationIntensityQECam.h" -#include "MCalibrationIntensityConstCam.h" #include "MBadPixelsIntensityCam.h" @@ -261,5 +261,4 @@ MCalibrationIntensityBlindCam iblcam; MCalibrationIntensityRelTimeCam itmcam; - MCalibrationIntensityConstCam icncam; MBadPixelsIntensityCam ibdcam; @@ -293,5 +292,4 @@ interlacedcont.Add(&itmcam); interlacedcont.Add(&ibdcam); - interlacedcont.Add(&icncam); interlacedcont.Add(&hchacam); if (IsUseBlindPixel()) @@ -357,6 +355,8 @@ // This is necessary for the case in which it is not in the files + MCalibConstCam constcam; + MBadPixelsCam badcam; - icncam.SetBadPixels(&badpix); + constcam.SetBadPixels(&badpix); // Setup Parlist @@ -364,4 +364,5 @@ plist.AddToList(this); // take care of fDisplay! plist.AddToList(&badcam); + plist.AddToList(&constcam); //plist.AddToList(&hilcam); plist.AddToList(&calibcont); // Using AddToList(TObjArray *) @@ -628,5 +629,5 @@ MFillH fill6(&evt6, "MBadPixelsCam", "FillUnsuitable"); // MFillH fill7(&evt7, "MSignalCam", "FillTimes"); - MFillH fill8(&evt8, "MCalibrationIntensityConstCam", "FillConv"); + MFillH fill8(&evt8, "MCalibConstCam", "FillConv"); MFillH fill9(&evt9, "MSignalCam", "FillPulse"); MFillH fillR(&evtR, "MExtractedSignalCam", "FillHiLoCal"); @@ -800,5 +801,5 @@ tlist2.AddToList(&fillC); - tlist2.AddToList(&fillP); + //tlist2.AddToList(&fillP); */ Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 8413) +++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 8414) @@ -111,16 +111,6 @@ #include "MEvtLoop.h" -#include "MHCamEvent.h" #include "MHCamera.h" #include "MGeomCam.h" - -#include "MPedestalCam.h" -#include "MPedestalSubtract.h" -#include "MCalibColorSteer.h" - -#include "MCalibrationIntensityChargeCam.h" -#include "MCalibrationIntensityBlindCam.h" -#include "MCalibrationIntensityRelTimeCam.h" -#include "MCalibrationIntensityQECam.h" #include "MCalibrationPatternDecode.h" @@ -163,6 +153,4 @@ #include "MExtractPINDiode.h" #include "MExtractBlindPixel.h" -//#include "MExtractSlidingWindow.h" -//#include "MExtractTimeHighestIntegral.h" #include "MExtractTimeAndChargeSpline.h" #include "MFCosmics.h" @@ -193,6 +181,5 @@ // // - fExtractor to NULL, fTimeExtractor to NULL, fColor to kNONE, -// fDisplay to kNormalDisplay, kRelTimes to kFALSE, kataCheck to kFALSE, kDebug to kFALSE, -// kIntensity to kFALSE +// fDisplay to kNormalDisplay, kRelTimes to kFALSE, kataCheck to kFALSE, kDebug to kFALSE // - SetUseBlindPixel() // - SetUsePINDiode() @@ -210,5 +197,4 @@ SetRelTimeCalibration(); SetDebug(kFALSE); - SetIntensity(kFALSE); SetReferenceFile(); @@ -368,90 +354,70 @@ MHCamera disp37(geomcam, "TotalConvPhe", "Conversion Factor to equiv. Phe's"); - MCalibrationChargeCam *cam = NULL; - MCalibrationQECam *qecam = NULL; - MCalibrationRelTimeCam *relcam = NULL; - MBadPixelsCam *badcam = NULL; - - if (IsIntensity()) - { - cam = (MCalibrationChargeCam*) fIntensCalibCam.GetCam(); - qecam = (MCalibrationQECam*) fIntensQECam.GetCam(); - relcam = (MCalibrationRelTimeCam*)fIntensRelTimeCam.GetCam(); - badcam = (MBadPixelsCam*) fIntensBadCam.GetCam(); - } - else - { - cam = &fCalibrationCam; - qecam = &fQECam; - relcam = &fRelTimeCam; - badcam = &fBadPixels; - } - // Fitted charge means and sigmas - disp1.SetCamContent(*cam, 0); - disp1.SetCamError( *cam, 1); - disp2.SetCamContent(*cam, 2); - disp2.SetCamError( *cam, 3); + disp1.SetCamContent(fCalibrationCam, 0); + disp1.SetCamError( fCalibrationCam, 1); + disp2.SetCamContent(fCalibrationCam, 2); + disp2.SetCamError( fCalibrationCam, 3); // Reduced Sigmas and reduced sigmas per charge - disp3.SetCamContent(*cam, 5); - disp3.SetCamError( *cam, 6); - disp4.SetCamContent(*cam, 7); - disp4.SetCamError( *cam, 8); + disp3.SetCamContent(fCalibrationCam, 5); + disp3.SetCamError( fCalibrationCam, 6); + disp4.SetCamContent(fCalibrationCam, 7); + disp4.SetCamError( fCalibrationCam, 8); // F-Factor Method - disp5.SetCamContent(*cam, 9); - disp5.SetCamError( *cam, 10); - disp6.SetCamContent(*cam, 11); - disp6.SetCamError( *cam, 12); - disp7.SetCamContent(*cam, 13); - disp7.SetCamError( *cam, 14); + disp5.SetCamContent(fCalibrationCam, 9); + disp5.SetCamError( fCalibrationCam, 10); + disp6.SetCamContent(fCalibrationCam, 11); + disp6.SetCamError( fCalibrationCam, 12); + disp7.SetCamContent(fCalibrationCam, 13); + disp7.SetCamError( fCalibrationCam, 14); // Quantum Efficiencies - disp8.SetCamContent (*qecam, 0 ); - disp8.SetCamError (*qecam, 1 ); - disp9.SetCamContent (*qecam, 2 ); - disp9.SetCamError (*qecam, 3 ); - disp10.SetCamContent(*qecam, 4 ); - disp10.SetCamError (*qecam, 5 ); - disp11.SetCamContent(*qecam, 6 ); - disp11.SetCamError (*qecam, 7 ); + disp8.SetCamContent (fQECam, 0 ); + disp8.SetCamError (fQECam, 1 ); + disp9.SetCamContent (fQECam, 2 ); + disp9.SetCamError (fQECam, 3 ); + disp10.SetCamContent(fQECam, 4 ); + disp10.SetCamError (fQECam, 5 ); + disp11.SetCamContent(fQECam, 6 ); + disp11.SetCamError (fQECam, 7 ); // Valid flags - disp12.SetCamContent(*qecam, 8 ); - disp13.SetCamContent(*qecam, 9 ); - disp14.SetCamContent(*qecam, 10); - disp15.SetCamContent(*qecam, 11); + disp12.SetCamContent(fQECam, 8 ); + disp13.SetCamContent(fQECam, 9 ); + disp14.SetCamContent(fQECam, 10); + disp15.SetCamContent(fQECam, 11); // Conversion Hi-Lo - disp16.SetCamContent(*cam, 25); - disp17.SetCamContent(*cam, 16); - disp17.SetCamError (*cam, 17); - disp18.SetCamContent(*cam, 18); - disp18.SetCamError (*cam, 19); + disp16.SetCamContent(fCalibrationCam, 25); + disp17.SetCamContent(fCalibrationCam, 16); + disp17.SetCamError (fCalibrationCam, 17); + disp18.SetCamContent(fCalibrationCam, 18); + disp18.SetCamError (fCalibrationCam, 19); // Pickup and Blackout - disp19.SetCamContent(*cam, 21); - disp20.SetCamContent(*cam, 22); - disp21.SetCamContent(*cam, 23); - disp22.SetCamContent(*cam, 24); + disp19.SetCamContent(fCalibrationCam, 21); + disp20.SetCamContent(fCalibrationCam, 22); + disp21.SetCamContent(fCalibrationCam, 23); + disp22.SetCamContent(fCalibrationCam, 24); // Pixels with defects - disp23.SetCamContent(*cam, 20); - disp24.SetCamContent(*badcam, 6); - disp25.SetCamContent(*badcam, 7); + disp23.SetCamContent(fCalibrationCam, 20); + disp24.SetCamContent(fBadPixels, 6); + disp25.SetCamContent(fBadPixels, 7); // Oscillations - disp26.SetCamContent(*badcam, 10); - disp27.SetCamContent(*badcam, 11); + disp26.SetCamContent(fBadPixels, 10); + disp27.SetCamContent(fBadPixels, 11); // Arrival Times - disp28.SetCamContent(*cam, 26); - disp28.SetCamError( *cam, 27); - disp29.SetCamContent(*cam, 27); + disp28.SetCamContent(fCalibrationCam, 26); + disp28.SetCamError( fCalibrationCam, 27); + disp29.SetCamContent(fCalibrationCam, 27); // RMS and Mean - disp36.SetCamContent(*cam,32); - disp36.SetCamError(*cam,33); + disp36.SetCamContent(fCalibrationCam,32); + disp36.SetCamError(fCalibrationCam,33); disp1.SetYTitle("Q [FADC cnts]"); @@ -498,6 +464,6 @@ { - MCalibrationChargePix &pix = (MCalibrationChargePix&)(*cam) [i]; - MCalibrationQEPix &qe = (MCalibrationQEPix&) (*qecam)[i]; + MCalibrationChargePix &pix = (MCalibrationChargePix&)fCalibrationCam[i]; + MCalibrationQEPix &qe = (MCalibrationQEPix&)fQECam[i]; if (!pix.IsFFactorMethodValid()) @@ -517,11 +483,11 @@ if (IsRelTimes()) { - disp30.SetCamContent(*relcam,0); - disp30.SetCamError( *relcam,1); - disp31.SetCamContent(*relcam,2); - disp31.SetCamError( *relcam,3); - disp32.SetCamContent(*relcam,4); - disp33.SetCamContent(fBadPixels,20); - disp34.SetCamContent(fBadPixels,21); + disp30.SetCamContent(fRelTimeCam, 0); + disp30.SetCamError( fRelTimeCam, 1); + disp31.SetCamContent(fRelTimeCam, 2); + disp31.SetCamError( fRelTimeCam, 3); + disp32.SetCamContent(fRelTimeCam, 4); + disp33.SetCamContent(fBadPixels, 20); + disp34.SetCamContent(fBadPixels, 21); disp30.SetYTitle("Time Offset [FADC units]"); @@ -1587,5 +1553,4 @@ // MJCalibration.DataCheck: yes,no // MJCalibration.Debug: yes,no -// MJCalibration.Intensity: yes,no // MJCalibration.UseBlindPixel: yes,no // MJCalibration.UsePINDiode: yes,no @@ -1612,5 +1577,4 @@ SetRelTimeCalibration(GetEnv("RelTimeCalibration", IsRelTimes())); - SetIntensity(GetEnv("IntensityCalibration", IsIntensity())); SetDebug(GetEnv("Debug", IsDebug())); @@ -1661,8 +1625,5 @@ (run(two) : static_cast(three)); - if (IsIntensity()) - blindresults.Copy(*fIntensBlindCam.GetCam()); - else - blindresults.Copy(fCalibrationBlindCam); + blindresults.Copy(fCalibrationBlindCam); blindext.SetExtractionType(MExtractBlindPixel::kIntegral); @@ -1759,29 +1720,11 @@ // Calibration Results containers // - if (IsIntensity()) - { - - MCalibrationChargeCam *cam = (MCalibrationChargeCam*)fIntensCalibCam.GetCam(); - cam->InitSize(fCalibrationCam.GetSize()); - cam->MergeHiLoConversionFactors(fCalibrationCam); - - plist.AddToList(&fIntensQECam); - plist.AddToList(&fIntensCalibCam); - // plist.AddToList(&fIntensCalibrationPINDiode); - plist.AddToList(&fIntensRelTimeCam); - plist.AddToList(&fIntensBadCam); - if (IsUseBlindPixel()) - plist.AddToList(&fIntensBlindCam); - } - else - { - plist.AddToList(&fQECam); - plist.AddToList(&fCalibrationCam); - plist.AddToList(&fRelTimeCam); - if (IsUseBlindPixel()) - plist.AddToList(&fCalibrationBlindCam); - if (IsUsePINDiode()) - plist.AddToList(&fCalibrationPINDiode); - } + plist.AddToList(&fQECam); + plist.AddToList(&fCalibrationCam); + plist.AddToList(&fRelTimeCam); + if (IsUseBlindPixel()) + plist.AddToList(&fCalibrationBlindCam); + if (IsUsePINDiode()) + plist.AddToList(&fCalibrationPINDiode); // @@ -1918,20 +1861,4 @@ tlist.AddToList(&pedsub); - // Setup to use the hi-gain extraction window in the lo-gain - // range (the start of the lo-gain range is added automatically - // by MPedCalcFromLoGain) - // - // The window size of the extractor is not yet initialized, - // so we have to stick to the extraction range - const Int_t f = fExtractor->GetHiGainFirst(); - const Int_t l = fExtractor->GetHiGainLast(); - const Int_t w = (l-f+1)&~1; - - MPedCalcPedRun pedcalc; - pedcalc.SetExtractWindow(f, w); - - if (IsIntensity()) - tlist.AddToList(&pedcalc); - MCalibColorSet colorset; if (fColor != MCalibrationCam::kNONE) @@ -1967,8 +1894,4 @@ tlist.AddToList(&cont); - MCalibColorSteer steer; - if (IsIntensity()) - tlist.AddToList(&steer); - if (IsRelTimes()) { @@ -1996,4 +1919,9 @@ tlist.AddToList(&fill9); + /* + MFillH fillP("MHPulseShape", "", "FillPulseShape"); + fillP.SetNameTab("Pulse"); + tlist.AddToList(&fillP); + */ // Create and setup the eventloop @@ -2103,9 +2031,10 @@ // The following containers are written: // - MStatusDisplay -// - MCalibrationChargeCam or MCalibrationIntensityChargeCam -// - MCalibrationBlindCam or MCalibrationIntensityBlindCam -// - MCalibrationQECam or MCalibrationIntensityQECam +// - MCalibrationChargeCam +// - MCalibrationBlindCam +// - MCalibrationQECam // - MCalibrationChargePINDiode // - MBadPixelsCam +// // If the flag kRelTimes is set, then also: // - MCalibrationRelTimeCam or MCalibrationIntensityRelTimeCam @@ -2117,23 +2046,12 @@ TObjArray cont; - - if (IsIntensity()) - { - cont.Add(&fIntensBadCam); - cont.Add(&fIntensCalibCam); - cont.Add(&fIntensQECam); - cont.Add(&fIntensBlindCam); - } - else - { - cont.Add(&fBadPixels); - cont.Add(&fCalibrationCam); - cont.Add(&fQECam); - cont.Add(&fCalibrationBlindCam); - } + cont.Add(&fBadPixels); + cont.Add(&fCalibrationCam); + cont.Add(&fQECam); + cont.Add(&fCalibrationBlindCam); cont.Add(&fCalibrationPINDiode); - //if (IsRelTimes()) - cont.Add(IsIntensity() ? (TObject*)&fIntensRelTimeCam : (TObject*)&fRelTimeCam); + if (IsRelTimes()) + cont.Add(&fRelTimeCam); if (fExtractorCam.GetSize() != 0)