Changeset 3943 for trunk


Ignore:
Timestamp:
05/03/04 15:22:08 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
1 added
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3942 r3943  
    3232     - changed name for alphabetical display in dox
    3333
     34   * mjobs/MJCalibration.[h,cc]
    3435   * msignal/MExtractTimeSpline.h
    3536   * msignal/MExtractTimeHighestIntegral.h
    3637     - changed name of base class to MExtractTime
     38
    3739
    3840   * mcalib/MCalibrationCam.[h,cc]

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r3925 r3943  
    4242//
    4343// Different arrival time extractors can be set with the command SetTimeExtractor()
    44 // Only extractors deriving from MTimeExtractor can be set, default is MExtractTimeSpline
     44// Only extractors deriving from MExtractTime can be set, default is MExtractTimeSpline
    4545//
    4646// At the end of the eventloop, plots and results are displayed, depending on
    … …  
    120120#include "MBadPixelsMerge.h"
    121121#include "MBadPixelsCam.h"
    122 #include "MTimeExtractor.h"
     122#include "MExtractTime.h"
    123123#include "MExtractor.h"
    124124#include "MExtractPINDiode.h"
    … …  
    768768//   5)  MExtractPINDiode
    769769//   6)  MExtractBlindPixel
    770 //   7)  MTimeExtractor (only if flag fRelTimes is chosen)
     770//   7)  MExtractTime (only if flag fRelTimes is chosen)
    771771//   8)  MContinue(MFCosmics)
    772772//   9)  MFillH("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode")
    … …  
    828828  MCalibrationChargePINDiode pindiode;
    829829  MCalibrationChargeBlindPix blindpix;
    830  
     830
    831831  plist.AddToList(&pedcam);
    832832  plist.AddToList(&fBadPixels);
    … …  
    893893        {
    894894          *fLog << warn << GetDescriptor()
    895                 << ": No extractor has been chosen, take default MTimeExtractSpine " << endl;
     895                << ": No extractor has been chosen, take default MTimeExtractSpline " << endl;
    896896          tlist.AddToList(&timespline);
    897897        }
    … …  
    925925 
    926926  tlist.PrintStatistics();
     927
     928  MHCalibrationChargeCam *fllcm = (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam");
     929  (*fllcm)[100].DrawClone();
    927930 
    928931  DisplayResult(plist);

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.h

    r3913 r3943  
    2222class MPedestalCam;
    2323class MExtractor;
    24 class MTimeExtractor;
     24class MExtractTime;
    2525class MJCalibration : public MParContainer, public MGCamDisplays
    2626{
    … …  
    3333  MRunIter       *fRuns;                                   // Calibration files
    3434  MExtractor     *fExtractor;                              // Signal extractor
    35   MTimeExtractor *fTimeExtractor;                          // Arrival Time extractor
     35  MExtractTime  *fTimeExtractor;                          // Arrival Time extractor
    3636 
    3737  MBadPixelsCam          fBadPixels;                       // Bad Pixels cam, can be set from previous runs
    … …  
    7070  void SetBadPixels(const MBadPixelsCam &bad)     { bad.Copy(fBadPixels);   }
    7171  void SetExtractor(MExtractor* ext)              { fExtractor = ext; }
    72   void SetTimeExtractor(MTimeExtractor* ext)       { fTimeExtractor = ext; }
     72  void SetTimeExtractor(MExtractTime* ext)       { fTimeExtractor = ext; }
    7373  void SetQECam    (const MCalibrationQECam &qe) { qe.Copy(fQECam);        }   
    7474  void SetColor    (const MCalibrationCam::PulserColor_t color) { fColor = color; }

  • trunk/MagicSoft/Mars/msignal/MExtractTimeHighestIntegral.h

    r3913 r3943  
    22#define MARS_MExtractTimeHighestIntegral
    33
    4 #ifndef MARS_MTimeExtractor
    5 #include "MTimeExtractor.h"
     4#ifndef MARS_MExtractTime
     5#include "MExtractTime.h"
    66#endif
    77
    8 class MExtractTimeHighestIntegral : public MTimeExtractor
     8class MExtractTimeHighestIntegral : public MExtractTime
    99{
    1010private:

  • trunk/MagicSoft/Mars/msignal/MExtractTimeSpline.h

    r3898 r3943  
    22#define MARS_MExtractTimeSpline
    33
    4 #ifndef MARS_MTimeExtractor
    5 #include "MTimeExtractor.h"
     4#ifndef MARS_MExtractTime
     5#include "MExtractTime.h"
    66#endif
    77
    88class MPedestalPix;
    9 class MExtractTimeSpline : public MTimeExtractor
     9class MExtractTimeSpline : public MExtractTime
    1010{
    1111

  • trunk/MagicSoft/Mars/msignal/Makefile

    r3927 r3943  
    4141           MExtractBlindPixel.cc \
    4242           MExtractedSignalBlindPixel.cc \
    43            MTimeExtractor.cc \
     43           MExtractTime.cc \
    4444           MExtractTimeSpline.cc \
    4545           MExtractTimeHighestIntegral.cc \

  • trunk/MagicSoft/Mars/msignal/SignalLinkDef.h

    r3913 r3943  
    2222#pragma link C++ class MExtractedSignalBlindPixel++;
    2323
    24 #pragma link C++ class MTimeExtractor+;
     24#pragma link C++ class MExtractTime+;
    2525#pragma link C++ class MExtractTimeSpline+;
    2626#pragma link C++ class MExtractTimeHighestIntegral+;
Note: See TracChangeset for help on using the changeset viewer.