Changeset 8418


Ignore:
Timestamp:
04/18/07 16:45:11 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r8415 r8418  
    3434     - fixed some typos in comments
    3535
    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)
    4778
    4879
  • trunk/MagicSoft/Mars/NEWS

    r8414 r8418  
    2323   - callisto: removed unsused intensity calibration from MJCalibration
    2424     for further simplification
     25
     26   - callisto: for simplification removed references to MBadPixelsIntensityCam,
     27     this also removes support for previously excluded pixels (TO BE FIXED)
    2528
    2629   - callisto: Added the option to write an event movie. Please use
  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r8414 r8418  
    7373#include "MCalibrationIntensityRelTimeCam.h"
    7474#include "MCalibrationIntensityQECam.h"
    75 #include "MBadPixelsIntensityCam.h"
    7675
    7776#include "MHCalibrationChargeCam.h"
     
    106105#include "MCalibrateData.h"
    107106#include "MCalibrateRelTimes.h"
    108 #include "MBadPixelsMerge.h"
     107//#include "MBadPixelsMerge.h"
    109108#include "MBadPixelsCalc.h"
    110109#include "MBadPixelsTreat.h"
     
    261260    MCalibrationIntensityBlindCam       iblcam;
    262261    MCalibrationIntensityRelTimeCam     itmcam;
    263     MBadPixelsIntensityCam              ibdcam;
    264262
    265263    MHCalibrationChargeCam      hchacam;
     
    291289        interlacedcont.Add(&iblcam);
    292290        interlacedcont.Add(&itmcam);
    293         interlacedcont.Add(&ibdcam);
    294291        interlacedcont.Add(&hchacam);
    295292        if (IsUseBlindPixel())
     
    357354    MCalibConstCam constcam;
    358355
    359     MBadPixelsCam badcam;
     356    //MBadPixelsCam badcam;
    360357    constcam.SetBadPixels(&badpix);
    361358
     
    363360    MParList plist;
    364361    plist.AddToList(this); // take care of fDisplay!
    365     plist.AddToList(&badcam);
     362    plist.AddToList(&badpix);
    366363    plist.AddToList(&constcam);
    367364    //plist.AddToList(&hilcam);
     
    410407    if (!geom.IsNull())
    411408        apply.SetGeometry(geom);
    412     MBadPixelsMerge        merge(&badpix);
     409    //MBadPixelsMerge        merge(&badpix);
    413410
    414411    // Make sure that pedcamab has the correct name
     
    711708    tlist2.AddToList(&decode);
    712709    tlist2.AddToList(&apply);
    713     tlist2.AddToList(&merge);
     710    //tlist2.AddToList(&merge);
    714711    tlist2.AddToList(&pedsub);
    715712    tlist2.AddToList(&ftp2);
Note: See TracChangeset for help on using the changeset viewer.