Changeset 4274

Timestamp:

06/03/04 11:10:01 (21 years ago)

Author:

merck

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (4 diffs)
• mjobs/MJExtractSignal.cc (modified) (5 diffs)
• mjobs/MJExtractSignal.h (modified) (3 diffs)
• msignal/MArrivalTime.h (modified) (1 diff)
• msignal/MArrivalTimeCam.h (modified) (1 diff)
• msignal/MArrivalTimePix.h (modified) (1 diff)
• msignal/MExtractedSignalBlindPixel.h (modified) (1 diff)
• msignal/MExtractedSignalCam.h (modified) (1 diff)
• msignal/MExtractedSignalPINDiode.h (modified) (1 diff)
• msignal/MExtractedSignalPix.h (modified) (1 diff)
• msignal/SignalLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/06/03: Martin Merck
+
+   * msignal/MArrivalTimeCam.h
+   * msignal/MArrivalTime.h
+   * msignal/MArrivalTimePix.h
+   * msignal/MExtractedSignalCam.h
+   * msignal/MExtractedSignalPix.h
+   * msignal/MExtractedSignalPINDiode.h
+   * msignal/MExtractedSignalBlindPixel.h
+     - Set version in ClassDef to 1 for the streamer.
+
+   * msignal/SignalLinkDef.h
+     - Added a + at the pragma for MExtractedSignalCam and 
+       MExtractedSignalPix for consistency.
+
+   * msjobs/MExtractSignal.[h,cc]
+     - Added methods to set the Extractor and TimeExtractor to be
+       used when extracting the signal.
+
+ 
  2004/06/03: Markus Gaug
 
@@ -934 +954 @@
 
    * mcalib/MHCalibrationRelTimeCam.[h,cc]
-     -  Getter and Setter for the reference pixel
+     - Getter and Setter for the reference pixel
 
    * mcalib/MCalibrate.cc
@@ -4224 +4244 @@
 
 
- 2004/02/12: Javier López
+ 2004/02/12: Javier L�ez
 
    * macros/pointspreadfunction.C
@@ -5919 +5939 @@
 
 
- 2004/01/09: Javier L¢pez
+ 2004/01/09: Javier Lpez
 
    * macros/bootcampstandardanalysis.C

trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc

@@ -42 +42 @@
 #include "MTaskList.h"
 #include "MEvtLoop.h"
+#include "MPrint.h"
 
 #include "MHCamera.h"
@@ -59 +60 @@
 #include "MWriteRootFile.h"
 
+#include "MExtractSlidingWindow.h"
+#include "MExtractor.h"
+#include "MExtractTime.h"
+#include "MExtractTimeFastSpline.h"
+
 #include "MJExtractSignal.h"
 #include "MStatusDisplay.h"
@@ -176 +182 @@
   static_cast<MRead&>(read).AddFiles(*fRuns);
   
-  MGeomApply      apply; // Only necessary to craete geometry
-  MBadPixelsMerge merge(&fBadPixels);
-  MExtractSignal  extract;
+  MGeomApply               apply; // Only necessary to craete geometry
+  MBadPixelsMerge          merge(&fBadPixels);
+  MExtractTimeFastSpline   exttime;
+  MExtractSlidingWindow    extcharge; // Only for the cosmics filter
   
   MHCamEvent evt("ExtSignal");
@@ -186 +193 @@
   MWriteRootFile write(GetOutputFileD(), "RECREATE", fRuns->GetRunsAsString(), 2);
   write.AddContainer("MExtractedSignalCam", "Events");
+  write.AddContainer("MArrivalTimeCam",     "Events");
   write.AddContainer("MTime",               "Events");
   write.AddContainer("MRawEvtHeader",       "Events");
@@ -195 +203 @@
   tlist.AddToList(&apply);
   tlist.AddToList(&merge);
-  tlist.AddToList(&extract);
+  
+  if (fTimeExtractor)
+    tlist.AddToList(fTimeExtractor);
+  else
+  {
+      *fLog << warn << GetDescriptor() 
+            << ": No extractor has been chosen, take default MExtractTimeFastSpline " << endl;
+      tlist.AddToList(&exttime);
+  }
+
+  if (fExtractor)
+    tlist.AddToList(fExtractor);
+  else
+  {
+      *fLog << warn << GetDescriptor() 
+            << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
+      tlist.AddToList(&extcharge);
+  }
+
+//  MPrint print("MExtractedSignalCam");
+//  tlist.AddToList(&print);
+  
   if (TestBit(kEnableGraphicalOutput))
     tlist.AddToList(&fill);

trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h

@@ -17 +17 @@
 class MCalibrationChargeCam;
 class MCalibrationQECam;
+class MExtractor;
+class MExtractTime;
 
 class MJExtractSignal : public MParContainer
@@ -24 +26 @@
 
     MRunIter *fRuns;
+    
+    MExtractor   *fExtractor;                  // Signal extractor
+    MExtractTime *fTimeExtractor;              // Arrival time extractor  
 
     MPedPhotCam   fPedPhotCam;
@@ -48 +53 @@
     const MBadPixelsCam &GetBadPixels()  const { return fBadPixels; }
 
+    void SetExtractor(MExtractor* ext)              { fExtractor = ext; }
+    void SetTimeExtractor(MExtractTime* ext)         { fTimeExtractor = ext; }
     void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
 

trunk/MagicSoft/Mars/msignal/MArrivalTime.h

@@ -46 +46 @@
     void DrawPixelContent(Int_t num) const;
 
-    ClassDef(MArrivalTime, 0)    // class for an event containing the arrival times
+//     ClassDef(MArrivalTime, 1)    // class for an event containing the arrival times
 };
 

trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.h

@@ -61 +61 @@
     void DrawPixelContent(Int_t num) const;
 
-    ClassDef(MArrivalTimeCam, 0)        // Storage Container for the ArrivalTime in the camera
+    ClassDef(MArrivalTimeCam, 1)        // Storage Container for the ArrivalTime in the camera
 };
 

trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h

@@ -41 +41 @@
     Bool_t IsValid() const;   
 
-    ClassDef(MArrivalTimePix, 0)        // Storage Container for ArrivalTime information of one pixel
+    ClassDef(MArrivalTimePix, 1)        // Storage Container for ArrivalTime information of one pixel
 };
 

trunk/MagicSoft/Mars/msignal/MExtractedSignalBlindPixel.h

@@ -57 +57 @@
   Float_t GetPedRmsErr() const { return fPedRmsErr; }
 
-  ClassDef(MExtractedSignalBlindPixel, 0)       // Storage Container for Extracted Signal of the blind pixel
+  ClassDef(MExtractedSignalBlindPixel, 1)       // Storage Container for Extracted Signal of the blind pixel
 };
 

trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.h

@@ -65 +65 @@
     void DrawPixelContent(Int_t num) const;
 
-    ClassDef(MExtractedSignalCam, 0)    // Storage Container for extracted signals in the camera
+    ClassDef(MExtractedSignalCam, 1)    // Storage Container for extracted signals in the camera
 };
 

trunk/MagicSoft/Mars/msignal/MExtractedSignalPINDiode.h

@@ -47 +47 @@
     Bool_t IsValid() const;   
 
-    ClassDef(MExtractedSignalPINDiode, 0)       // Storage Container for Extracted Signal information of one pixel
+    ClassDef(MExtractedSignalPINDiode, 1)       // Storage Container for Extracted Signal information of one pixel
 };
 

trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.h

@@ -42 +42 @@
     Bool_t IsValid() const;   
 
-    ClassDef(MExtractedSignalPix, 0)    // Storage Container for Extracted Signal information of one pixel
+    ClassDef(MExtractedSignalPix, 1)    // Storage Container for Extracted Signal information of one pixel
 };
 

trunk/MagicSoft/Mars/msignal/SignalLinkDef.h

@@ -25 +25 @@
 #pragma link C++ class MExtractTimeFastSpline+;
 #pragma link C++ class MExtractTimeHighestIntegral+;
-#pragma link C++ class MArrivalTimeCam;
-#pragma link C++ class MArrivalTimePix;
+#pragma link C++ class MArrivalTimeCam+;
+#pragma link C++ class MArrivalTimePix+;
 #pragma link C++ class MArrivalTime+;
 #pragma link C++ class MArrivalTimeCalc+;