Changeset 14922 for trunk/Mars

Timestamp:

02/13/13 16:47:35 (12 years ago)

Author:

tbretz

Message:

New classes for DRS calibration.

Location:

trunk/Mars/mdrs

Files:

• . (added)
• DrsIncl.h (added)
• DrsLinkDef.h (added)
• MCalibrateDrsTimes.cc (copied) (copied from trunk/Mars/mcalib/MCalibrateDrsTimes.cc ) (3 diffs)
• MCalibrateDrsTimes.h (copied) (copied from trunk/Mars/mcalib/MCalibrateDrsTimes.h )
• MDrsCalibApply.cc (copied) (copied from trunk/Mars/mpedestal/MDrsCalibApply.cc ) (4 diffs)
• MDrsCalibApply.h (copied) (copied from trunk/Mars/mpedestal/MDrsCalibApply.h )
• MDrsCalibration.cc (added)
• MDrsCalibration.h (added)
• MDrsCalibrationTime.cc (added)
• MDrsCalibrationTime.h (added)
• MHDrsCalibration.cc (added)
• MHDrsCalibration.h (added)
• MHDrsCalibrationCheck.cc (added)
• MHDrsCalibrationCheck.h (added)
• MHDrsCalibrationTime.cc (added)
• MHDrsCalibrationTime.h (added)
• Makefile (added)

trunk/Mars/mdrs/MCalibrateDrsTimes.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Markus Gaug  04/2004 <mailto:markus@ifae.es>
+!   Author(s): Thomas Bretz 2013 <mailto:thomas.bretz@epfl.ch>
 !
-!   Copyright: MAGIC Software Development, 2000-2006
+!   Copyright: MAGIC Software Development, 2000-2013
 !
 !
@@ -27 +27 @@
 //   MCalibrateDrsTimes
 //
-//   This task takes the extracted arrival times from MArrivalTimeCam for each  
-//   pixel and applies the offset calibrated in MCalibrationRelTimeCam 
-//   The calibrated arrival time and its error gets stored in MSignalCam. 
-//
-//   Input Containers:
-//    MArrivalTimeCam 
-//    MCalibrationRelTimeCam
-//
-//   Output Containers:
-//    MSignalCam
-//
 //////////////////////////////////////////////////////////////////////////////
 #include "MCalibrateDrsTimes.h"
 
-#include "MLog.h"
-#include "MLogManip.h"
-
 #include "MParList.h"
-
-#include "MGeomCam.h"
-
-#include "MCalibrationRelTimeCam.h"
-#include "MCalibrationRelTimePix.h"
 
 #include "MArrivalTimeCam.h"
@@ -58 +39 @@
 
 #include "MSignalCam.h"
-#include "MSignalPix.h"
 
 #include "MRawRunHeader.h"
 #include "MRawEvtData.h"
-#include "MHDrsCalib.h"
+
+#include "MDrsCalibrationTime.h"
 
 ClassImp(MCalibrateDrsTimes);
 
 using namespace std;
+
 // --------------------------------------------------------------------------
 //

trunk/Mars/mdrs/MDrsCalibApply.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz, 10/2006 <mailto:tbretz@astro.uni-wuerzburg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2008
+!   Author(s): Thomas Bretz, 2013<mailto:thomas.bretz@epfl.ch>
+!
+!   Copyright: MAGIC Software Development, 2013
 !
 !
@@ -26 +26 @@
 //
 //   MDrsCalibApply
-//
-//  This class merges hi- and lo-gain samples into one array and
-//  subtracts the pedestal (including the AB-offset) from the
-//  data and stores the result in MDrsCalibApplyedEvt.
-//
-// Input Containers:
-//   MRawEvtData
-//   MRawRunHeader
-//   MPedestalCam
-//
-// Output Containers:
-//   MDrsCalibApplyedEvt
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -56 +44 @@
 #include "MPedestalPix.h"
 
-#include "../mhist/MHDrsCalib.h"
+#include "MDrsCalibration.h"
 #include "MPedestalSubtractedEvt.h"
 
@@ -62 +50 @@
 #include "MExtractedSignalPix.h"
 
-ClassImp(MDrsCalibResult);
 ClassImp(MDrsCalibApply);