Changeset 3239


Ignore:
Timestamp:
02/19/04 11:00:22 (21 years ago)
Author:
moralejo
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r3238 r3239  
    44
    55                                                 -*-*- END OF LINE -*-*-
     6 2004/01/19: Thomas Bretz
     7
     8   * mhist/MHEvent.[h,cc]:
     9     - Changed names of Event "types" to make them more descriptive.
     10       Former kEvtSignal is now called kEvtSignalDensity, and indicates
     11       pixel content scaled by area. Added kEvtSignalRaw, which
     12       corresponds to pixel content (with no scaling) in whatever units
     13       (this depends on how the MHEvent object is filled!). The default
     14       constructor initializes type=kEvtSignalRaw.
     15
     16   * mmain/MEventDisplay.cc
     17     - Changed filling of evt1 and evt2. Now they are filled with raw
     18       content of MCerPhotEvt. Since in MEventDisplay, MCerPhotEvt is
     19       still filled uncalibrated (hence in ADC counts), this means that
     20       what will be now shown in Mars' camera display is now the signal
     21       in each pixel without scaling with pixel area. Given that the
     22       default flat fielding is such that equal light density
     23       corresponds to equal absolute signal (in ADC counts), this is
     24       more reasonable, and allows to check for instance how the
     25       relative pixel gains are adjusted by looking at calibration
     26       events. To be FIXED: there is however an "inconsistency" in
     27       MEventDisplay, and it is that MCerPhotEvt is still used to keep
     28       uncalibrated signals. To be replaced by MExtractedSignalCam?
     29
     30
    631 2004/01/19: Thomas Bretz
    732
  • trunk/MagicSoft/Mars/mhist/MHEvent.cc

    r3142 r3239  
    122122    switch (fType)
    123123    {
    124     case kEvtSignal:
    125         fHist->SetName("Signal");
     124    case kEvtSignalRaw:
     125        fHist->SetName("Signal (raw)");
     126        fHist->SetYTitle("S [au]");
     127        break;
     128    case kEvtSignalDensity:
     129        fHist->SetName("Signal density");
    126130        fHist->SetYTitle("S [au]");
    127131        break;
     
    182186    switch (fType)
    183187    {
    184     case kEvtSignal: // Get NumPhotons without pixel-size scaling
    185         //        fHist->SetCamContent(*event, 3);
    186         //        break;
     188    case kEvtSignalRaw:   // Get Content without pixel-size scaling
     189        fHist->SetCamContent(*event, 3);
     190        break;
     191    case kEvtSignalDensity:
     192        fHist->SetCamContent(*event, 0);
     193        break;
    187194    case kEvtPedestal:
    188195        fHist->SetCamContent(*event, 0);
  • trunk/MagicSoft/Mars/mhist/MHEvent.h

    r2781 r3239  
    2020public:
    2121    enum EventType_t {
    22         kEvtSignal, kEvtPedestal, kEvtPedestalRMS,
    23         kEvtRelativeSignal, kEvtCleaningLevels,
    24         kEvtIdxMax, kEvtArrTime
     22        kEvtSignalRaw, kEvtSignalDensity, kEvtPedestal,
     23        kEvtPedestalRMS, kEvtRelativeSignal, kEvtCleaningLevels,
     24        kEvtIdxMax, kEvtArrTime 
    2525    };
    2626
     
    4747
    4848public:
    49     MHEvent(EventType_t type=kEvtSignal);
     49    MHEvent(EventType_t type=kEvtSignalRaw);
    5050    ~MHEvent();
    5151
  • trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

    r3089 r3239  
    156156    fEvtLoop->SetParList(plist);
    157157
    158     MHEvent *evt1 = new MHEvent(MHEvent::kEvtSignal);
    159     MHEvent *evt2 = new MHEvent(MHEvent::kEvtSignal);
     158    MHEvent *evt1 = new MHEvent(MHEvent::kEvtSignalRaw);
     159    MHEvent *evt2 = new MHEvent(MHEvent::kEvtSignalRaw);
    160160    MHEvent *evt3 = new MHEvent(MHEvent::kEvtPedestal);
    161161    MHEvent *evt4 = new MHEvent(MHEvent::kEvtPedestalRMS);
Note: See TracChangeset for help on using the changeset viewer.