Changeset 3345 for trunk/MagicSoft


Ignore:
Timestamp:
02/27/04 20:12:28 (21 years ago)
Author:
moralejo
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3344 r3345  
    2020       ago).
    2121
     22   * mmain/Makefile
     23     - Added mcalib to list of include directories.
     24
    2225   * manalysis/MMcCalibrationUpdate.[h,cc]
    2326     - Added member variable Bool_t fOuterPixelsScaling, which is
    … …  
    2730       pixels electronic chain. This option was necessary to allow for
    2831       the change in the camera display (see above).
    29 
    30    * manalysis/Makefile
    31      - Added mcalib to list of include directories.
    3232
    3333   * macros/starmc.C

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

    r3265 r3345  
    3030
    3131    Bool_t  fFillCalibrationCam;
     32    Bool_t  fOuterPixelsGainScaling;
    3233
    3334    Float_t fAmplitude;      // FADC parameters from camera simulation (see camera manual)
    … …  
    3536    Float_t fConversionHiLo; // Ratio of high to low gain.
    3637
    37 
    3838public:
    3939    MMcCalibrationUpdate(const char *name=NULL, const char *title=NULL);
     40
     41    void SetOuterPixelsGainScaling(Bool_t tf)
     42      { fOuterPixelsGainScaling = tf; }
    4043
    4144    ClassDef(MMcCalibrationUpdate, 0)   // Task which obtains, for MC files, the pedestal mean and rms, and the calibration factor from ADC counts to photons.

  • trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

    r3343 r3345  
    5858// Tasks
    5959//
    60 #include "MReadMarsFile.h"       // MReadMarsFile
    61 #include "MGeomApply.h"          // MGeomApply
    62 #include "MFDataMember.h"        // MFDataMember
    63 #include "MMcPedestalCopy.h"     // MMcPedestalCopy
    64 #include "MMcPedestalNSBAdd.h"   // MMcPedestalNSBAdd
    65 #include "MCerPhotCalc.h"        // MCerPhotCalc
    66 #include "MCerPhotAnal2.h"       // MCerPhotAnal2
    67 #include "MImgCleanStd.h"        // MImgCleanStd
    68 #include "MHillasCalc.h"         // MHillasCalc
    69 #include "MHillasSrcCalc.h"      // MHillasSrcCalc
    70 #include "MBlindPixelCalc.h"     // MBlindPixelCalc
    71 #include "MArrivalTimeCalc.h"    // MArrivalTimeCalc
    72 #include "MFillH.h"              // MFillH
     60#include "MReadMarsFile.h"        // MReadMarsFile
     61#include "MGeomApply.h"           // MGeomApply
     62#include "MFDataMember.h"         // MFDataMember
     63#include "MMcPedestalCopy.h"      // MMcPedestalCopy
     64#include "MMcPedestalNSBAdd.h"    // MMcPedestalNSBAdd
     65
     66#include "MCerPhotAnal2.h"        // MCerPhotAnal2
     67#include "MImgCleanStd.h"         // MImgCleanStd
     68#include "MHillasCalc.h"          // MHillasCalc
     69#include "MHillasSrcCalc.h"       // MHillasSrcCalc
     70#include "MBlindPixelCalc.h"      // MBlindPixelCalc
     71#include "MArrivalTimeCalc.h"     // MArrivalTimeCalc
     72#include "MFillH.h"               // MFillH
     73#include "MExtractSignal.h"       // MExtractsignal
     74#include "MMcCalibrationUpdate.h" // MMcCalibrationUpdate
     75#include "MCalibrate.h"           // MCalibrate
    7376
    7477//
    … …  
    186189    MMcPedestalCopy   *pcopy = new MMcPedestalCopy;
    187190    MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
    188     MCerPhotCalc      *ncalc = new MCerPhotCalc;
    189191    MCerPhotAnal2     *nanal = new MCerPhotAnal2;
    190192    MFillH            *fill1 = new MFillH(evt1, "MCerPhotEvt", "MFillH1");
    … …  
    207209    f2->SetName("MFRealData");
    208210
    209     ncalc->SetFilter(f1);
     211    MExtractSignal* sigextract = new MExtractSignal();
     212    sigextract->SetRange(5, 9, 5, 9);
     213
     214    MMcCalibrationUpdate* mccalibupdate = new MMcCalibrationUpdate;
     215    mccalibupdate->SetOuterPixelsGainScaling(kFALSE);
     216    MCalibrate* mccalib = new MCalibrate;
     217
     218    // MC
     219    sigextract->SetFilter(f1);
     220    mccalibupdate->SetFilter(f1);
     221    mccalib->SetFilter(f1);
     222
     223    // Data
    210224    nanal->SetFilter(f2);
    211225
    … …  
    213227    tlist->AddToList(f2);
    214228    tlist->AddToList(pcopy);
    215     tlist->AddToList(ncalc);
    216229    tlist->AddToList(pdnsb);
     230
     231    tlist->AddToList(sigextract);
     232    tlist->AddToList(mccalibupdate);
     233    tlist->AddToList(mccalib);
     234
    217235    tlist->AddToList(nanal);
     236
    218237    tlist->AddToList(fill1);
    219238    tlist->AddToList(clean);

  • trunk/MagicSoft/Mars/mmain/Makefile

    r3331 r3345  
    2525           -I../mgui -I../mgeom -I../mhbase -I../mhist -I../mmontecarlo   \
    2626           -I../mfileio -I../mimage -I../mhistmc -I../mgbase -I../mfbase \
    27            -I../mdata -I../msignal
     27           -I../mdata -I../msignal -I../mcalib
    2828
    2929#------------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.