Changeset 8418
- Timestamp:
- 04/18/07 16:45:11 (18 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r8415 r8418 34 34 - fixed some typos in comments 35 35 36 * mjobs/MJCalibrateSignal.cc: 37 - removed dependenca on obsolete MCalibrationIntensityConstCam 38 39 * mjobs/MJCalibration.[h,cc]: 40 - for simplification removed all dependencies of unused intensity 41 calibration 42 43 * callisto.rc, callisto_Dec04Jan05.rc, callisto_MarApr05.rc, 44 callisto_mux.rc: 45 - removed line for switching on intensity calibration 46 - added expample lines for movie encoding 36 * mjobs/MJCalibrateSignal.cc: 37 - removed dependenca on obsolete MCalibrationIntensityConstCam 38 39 * mjobs/MJCalibration.[h,cc]: 40 - for simplification removed all dependencies of unused intensity 41 calibration 42 43 * callisto.rc, callisto_Dec04Jan05.rc, callisto_MarApr05.rc, 44 callisto_mux.rc: 45 - removed line for switching on intensity calibration 46 - added expample lines for movie encoding 47 48 * mbadpixels/BadPixelsLinkDef.h, mbadpixels/Makefile: 49 - removed obsolete MBadPixelsIntensityCam 50 51 * mcalib/MCalibCalcFromPast.[h.cc]: 52 - do not store fIntensRelTime (it is not used at all) as data member 53 54 * mcalib/MCalibColorSteer.[h,cc], mcalib/MCalibCalcFromPast.[h.cc]: 55 - instead of creating of a new MBadPixelsCam into the intensity array 56 clear the information of the old one (FIXME: DO NOT CLEAR PREV EXCL!) 57 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 58 * mcalib/MCalibrationTestCalc.[h,cc]: 59 - removed empty Process function 60 61 * mcalib/MCalibColorSteer.[h,cc], mcalib/MCalibCalcFromPast.[h.cc], 62 mcalib/MCalibrationChargeCalc.[h,cc], mcalib/MCalibrationTestCalc.[h,cc], 63 mcalib/MCalibrationRelTimeCalc.[h,cc], mhcalib/MHCalibrationCam.[h,cc], 64 mhcalib/MHCalibrationChargeCam.cc, mhcalib/MHCalibrationHiLoCam.cc, 65 mhcalib/MHCalibrationPulseTimeCam.cc, mhcalib/MHCalibrationRelTimeCam.cc, 66 mhcalib/MHPedestalCam.cc: 67 - removed obsolete references to MBadPixelsIntensityCam, replaced 68 by MBadPixelsCam 69 70 * mhcalib/MHCalibrationCam.cc: 71 - set reason for uncalibrated pixels by SetUncalibrated 72 73 * mjobs/MJCalibrateSignal.cc: 74 - removed obsolete references to MBadPixelsIntensityCam 75 - removed MBadPixelsMerge, instead use the given MBadPixelsCam as 76 starting point. THIS ALSO REMOVES SUPPORT FOR PREV. EXCLUDED PIXELS 77 (TO BE FIXED) 47 78 48 79 -
trunk/MagicSoft/Mars/NEWS
r8414 r8418 23 23 - callisto: removed unsused intensity calibration from MJCalibration 24 24 for further simplification 25 26 - callisto: for simplification removed references to MBadPixelsIntensityCam, 27 this also removes support for previously excluded pixels (TO BE FIXED) 25 28 26 29 - callisto: Added the option to write an event movie. Please use -
trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
r8414 r8418 73 73 #include "MCalibrationIntensityRelTimeCam.h" 74 74 #include "MCalibrationIntensityQECam.h" 75 #include "MBadPixelsIntensityCam.h"76 75 77 76 #include "MHCalibrationChargeCam.h" … … 106 105 #include "MCalibrateData.h" 107 106 #include "MCalibrateRelTimes.h" 108 #include "MBadPixelsMerge.h"107 //#include "MBadPixelsMerge.h" 109 108 #include "MBadPixelsCalc.h" 110 109 #include "MBadPixelsTreat.h" … … 261 260 MCalibrationIntensityBlindCam iblcam; 262 261 MCalibrationIntensityRelTimeCam itmcam; 263 MBadPixelsIntensityCam ibdcam;264 262 265 263 MHCalibrationChargeCam hchacam; … … 291 289 interlacedcont.Add(&iblcam); 292 290 interlacedcont.Add(&itmcam); 293 interlacedcont.Add(&ibdcam);294 291 interlacedcont.Add(&hchacam); 295 292 if (IsUseBlindPixel()) … … 357 354 MCalibConstCam constcam; 358 355 359 MBadPixelsCam badcam;356 //MBadPixelsCam badcam; 360 357 constcam.SetBadPixels(&badpix); 361 358 … … 363 360 MParList plist; 364 361 plist.AddToList(this); // take care of fDisplay! 365 plist.AddToList(&bad cam);362 plist.AddToList(&badpix); 366 363 plist.AddToList(&constcam); 367 364 //plist.AddToList(&hilcam); … … 410 407 if (!geom.IsNull()) 411 408 apply.SetGeometry(geom); 412 MBadPixelsMerge merge(&badpix);409 //MBadPixelsMerge merge(&badpix); 413 410 414 411 // Make sure that pedcamab has the correct name … … 711 708 tlist2.AddToList(&decode); 712 709 tlist2.AddToList(&apply); 713 tlist2.AddToList(&merge);710 //tlist2.AddToList(&merge); 714 711 tlist2.AddToList(&pedsub); 715 712 tlist2.AddToList(&ftp2);
Note:
See TracChangeset
for help on using the changeset viewer.