Changeset 4274 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
06/03/04 11:10:01 (20 years ago)
Author:
merck
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r4272 r4274  
    1919                                                 -*-*- END OF LINE -*-*-
    2020
     21 2004/06/03: Martin Merck
     22
     23   * msignal/MArrivalTimeCam.h
     24   * msignal/MArrivalTime.h
     25   * msignal/MArrivalTimePix.h
     26   * msignal/MExtractedSignalCam.h
     27   * msignal/MExtractedSignalPix.h
     28   * msignal/MExtractedSignalPINDiode.h
     29   * msignal/MExtractedSignalBlindPixel.h
     30     - Set version in ClassDef to 1 for the streamer.
     31
     32   * msignal/SignalLinkDef.h
     33     - Added a + at the pragma for MExtractedSignalCam and
     34       MExtractedSignalPix for consistency.
     35
     36   * msjobs/MExtractSignal.[h,cc]
     37     - Added methods to set the Extractor and TimeExtractor to be
     38       used when extracting the signal.
     39
     40 
    2141 2004/06/03: Markus Gaug
    2242
     
    934954
    935955   * mcalib/MHCalibrationRelTimeCam.[h,cc]
    936      -  Getter and Setter for the reference pixel
     956     - Getter and Setter for the reference pixel
    937957
    938958   * mcalib/MCalibrate.cc
     
    42244244
    42254245
    4226  2004/02/12: Javier López
     4246 2004/02/12: Javier Lez
    42274247
    42284248   * macros/pointspreadfunction.C
     
    59195939
    59205940
    5921  2004/01/09: Javier L¢pez
     5941 2004/01/09: Javier Lpez
    59225942
    59235943   * macros/bootcampstandardanalysis.C
  • trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc

    r4167 r4274  
    4242#include "MTaskList.h"
    4343#include "MEvtLoop.h"
     44#include "MPrint.h"
    4445
    4546#include "MHCamera.h"
     
    5960#include "MWriteRootFile.h"
    6061
     62#include "MExtractSlidingWindow.h"
     63#include "MExtractor.h"
     64#include "MExtractTime.h"
     65#include "MExtractTimeFastSpline.h"
     66
    6167#include "MJExtractSignal.h"
    6268#include "MStatusDisplay.h"
     
    176182  static_cast<MRead&>(read).AddFiles(*fRuns);
    177183 
    178   MGeomApply      apply; // Only necessary to craete geometry
    179   MBadPixelsMerge merge(&fBadPixels);
    180   MExtractSignal  extract;
     184  MGeomApply               apply; // Only necessary to craete geometry
     185  MBadPixelsMerge          merge(&fBadPixels);
     186  MExtractTimeFastSpline   exttime;
     187  MExtractSlidingWindow    extcharge; // Only for the cosmics filter
    181188 
    182189  MHCamEvent evt("ExtSignal");
     
    186193  MWriteRootFile write(GetOutputFileD(), "RECREATE", fRuns->GetRunsAsString(), 2);
    187194  write.AddContainer("MExtractedSignalCam", "Events");
     195  write.AddContainer("MArrivalTimeCam",     "Events");
    188196  write.AddContainer("MTime",               "Events");
    189197  write.AddContainer("MRawEvtHeader",       "Events");
     
    195203  tlist.AddToList(&apply);
    196204  tlist.AddToList(&merge);
    197   tlist.AddToList(&extract);
     205 
     206  if (fTimeExtractor)
     207    tlist.AddToList(fTimeExtractor);
     208  else
     209  {
     210      *fLog << warn << GetDescriptor()
     211            << ": No extractor has been chosen, take default MExtractTimeFastSpline " << endl;
     212      tlist.AddToList(&exttime);
     213  }
     214
     215  if (fExtractor)
     216    tlist.AddToList(fExtractor);
     217  else
     218  {
     219      *fLog << warn << GetDescriptor()
     220            << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
     221      tlist.AddToList(&extcharge);
     222  }
     223
     224//  MPrint print("MExtractedSignalCam");
     225//  tlist.AddToList(&print);
     226 
    198227  if (TestBit(kEnableGraphicalOutput))
    199228    tlist.AddToList(&fill);
  • trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h

    r4167 r4274  
    1717class MCalibrationChargeCam;
    1818class MCalibrationQECam;
     19class MExtractor;
     20class MExtractTime;
    1921
    2022class MJExtractSignal : public MParContainer
     
    2426
    2527    MRunIter *fRuns;
     28   
     29    MExtractor   *fExtractor;                  // Signal extractor
     30    MExtractTime *fTimeExtractor;              // Arrival time extractor 
    2631
    2732    MPedPhotCam   fPedPhotCam;
     
    4853    const MBadPixelsCam &GetBadPixels()  const { return fBadPixels; }
    4954
     55    void SetExtractor(MExtractor* ext)              { fExtractor = ext; }
     56    void SetTimeExtractor(MExtractTime* ext)         { fTimeExtractor = ext; }
    5057    void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
    5158
  • trunk/MagicSoft/Mars/msignal/MArrivalTime.h

    r3757 r4274  
    4646    void DrawPixelContent(Int_t num) const;
    4747
    48     ClassDef(MArrivalTime, 0)    // class for an event containing the arrival times
     48//     ClassDef(MArrivalTime, 1)    // class for an event containing the arrival times
    4949};
    5050
  • trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.h

    r3213 r4274  
    6161    void DrawPixelContent(Int_t num) const;
    6262
    63     ClassDef(MArrivalTimeCam, 0)        // Storage Container for the ArrivalTime in the camera
     63    ClassDef(MArrivalTimeCam, 1)        // Storage Container for the ArrivalTime in the camera
    6464};
    6565
  • trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h

    r4077 r4274  
    4141    Bool_t IsValid() const;   
    4242
    43     ClassDef(MArrivalTimePix, 0)        // Storage Container for ArrivalTime information of one pixel
     43    ClassDef(MArrivalTimePix, 1)        // Storage Container for ArrivalTime information of one pixel
    4444};
    4545
  • trunk/MagicSoft/Mars/msignal/MExtractedSignalBlindPixel.h

    r4190 r4274  
    5757  Float_t GetPedRmsErr() const { return fPedRmsErr; }
    5858
    59   ClassDef(MExtractedSignalBlindPixel, 0)       // Storage Container for Extracted Signal of the blind pixel
     59  ClassDef(MExtractedSignalBlindPixel, 1)       // Storage Container for Extracted Signal of the blind pixel
    6060};
    6161
  • trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.h

    r3446 r4274  
    6565    void DrawPixelContent(Int_t num) const;
    6666
    67     ClassDef(MExtractedSignalCam, 0)    // Storage Container for extracted signals in the camera
     67    ClassDef(MExtractedSignalCam, 1)    // Storage Container for extracted signals in the camera
    6868};
    6969
  • trunk/MagicSoft/Mars/msignal/MExtractedSignalPINDiode.h

    r3655 r4274  
    4747    Bool_t IsValid() const;   
    4848
    49     ClassDef(MExtractedSignalPINDiode, 0)       // Storage Container for Extracted Signal information of one pixel
     49    ClassDef(MExtractedSignalPINDiode, 1)       // Storage Container for Extracted Signal information of one pixel
    5050};
    5151
  • trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.h

    r3306 r4274  
    4242    Bool_t IsValid() const;   
    4343
    44     ClassDef(MExtractedSignalPix, 0)    // Storage Container for Extracted Signal information of one pixel
     44    ClassDef(MExtractedSignalPix, 1)    // Storage Container for Extracted Signal information of one pixel
    4545};
    4646
  • trunk/MagicSoft/Mars/msignal/SignalLinkDef.h

    r3971 r4274  
    2525#pragma link C++ class MExtractTimeFastSpline+;
    2626#pragma link C++ class MExtractTimeHighestIntegral+;
    27 #pragma link C++ class MArrivalTimeCam;
    28 #pragma link C++ class MArrivalTimePix;
     27#pragma link C++ class MArrivalTimeCam+;
     28#pragma link C++ class MArrivalTimePix+;
    2929#pragma link C++ class MArrivalTime+;
    3030#pragma link C++ class MArrivalTimeCalc+;
Note: See TracChangeset for help on using the changeset viewer.