Changeset 2867


Ignore:
Timestamp:
01/21/04 13:47:01 (21 years ago)
Author:
moralejo
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2865 r2867  
    55                                                 -*-*- END OF LINE -*-*-
    66
     7 2004/01/21: Abelardo moralejo
     8
     9   * manalysis/MMcCalibrationUpdate.[h,cc]
     10     - Added (see below).
     11
     12   * manalysis/MMcCalibrationCalc.[h,cc]
     13     - Removed: changed name of this class to MMcCalibrationUpdate,
     14       which is more representative of what it really does. Moved
     15       the filling of the MCalibrationCam container from Process to
     16       ReInit, since it does not change on an event by event basis.
     17       Updated class description.
     18
     19   * manalysis/Makefile, AnalysisLinkDef.h
     20     - Adapted to change above
     21
     22   * macros/starmc.C
     23     - Adapted to change above
     24
     25
    726 2004/01/21: Raquel de los Reyes
    827
    928   * mreport/MReportCC.h, mreport/MReportTrigger.h and
    1029     mcamera/MCameraCalibration.h
    11     - Added the "Get" functions (e.g GetStatus() for fStatus) to access
    12       the private data members of the class.
     30     - Added the "Get" functions (e.g GetStatus() for fStatus) to access
     31       the private data members of the class.
    1332
    1433

  • trunk/MagicSoft/Mars/macros/starmc.C

    r2824 r2867  
    7878    sigextract.SetRange(0, 5, 0, 5);
    7979
    80     MMcCalibrationCalc  mccalibcalc;
    81     // Define conversion factor from ADC counts to photons before camera for
     80    MMcCalibrationUpdate  mccalibcalc;
     81
     82    //
     83    // Now introduce conversion factor from ADC counts to photons before camera for
    8284    // inner pixels. The corresponding value for outer pixels is then calculated
    8385    // automatically. Bear in mind that the conversion factor depend both on the
    … …  
    8688    // event loop, either from the same MC file or from a MC calibration file
    8789    // written on purpose.
     90    // (FIXME: the conversion must be calculated automatically from the analyzed file)
     91    //
    8892    mccalibcalc.SetADC2PhInner(1.2586);
    8993
    … …  
    119123    tlist.AddToList(&geom);
    120124    tlist.AddToList(&pcopy);
     125
    121126    tlist.AddToList(&sigextract);
    122127    tlist.AddToList(&mccalibcalc);

  • trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

    r2837 r2867  
    7575#pragma link C++ class MArrivalTimeCalc+;
    7676
    77 #pragma link C++ class MMcCalibrationCalc+;
     77#pragma link C++ class MMcCalibrationUpdate+;
    7878
    7979#pragma link C++ class MPedPhotCam+;

  • trunk/MagicSoft/Mars/manalysis/Makefile

    r2855 r2867  
    8484           MArrivalTime.cc \
    8585           MArrivalTimeCalc.cc \
    86            MMcCalibrationCalc.cc
     86           MMcCalibrationUpdate.cc
    8787
    8888SRCS    = $(SRCFILES)
Note: See TracChangeset for help on using the changeset viewer.