Changeset 7771 for trunk

Timestamp:

06/29/06 10:26:03 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mmain/MEventDisplay.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/06/29 Thomas Bretz
+
+   * mmain/MEventDisplay.cc:
+     - added decoding of calibration pattern
+
+
 
  2006/06/28 Daniela Dorner

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -57 +57 @@
 #include "MLogManip.h"
 
-#include "MParList.h"            // MParList::AddToList
-#include "MEvtLoop.h"            // MEvtLoop::GetParList
-#include "MTaskList.h"           // MTaskList::AddToList
+#include "MParList.h"                  // MParList::AddToList
+#include "MEvtLoop.h"                  // MEvtLoop::GetParList
+#include "MTaskList.h"                 // MTaskList::AddToList
 
 //
 // Tasks
 //
-#include "MReadMarsFile.h"        // MReadMarsFile
-#include "MGeomApply.h"           // MGeomApply
-#include "MFDataMember.h"         // MFDataMember
-#include "MMcPedestalCopy.h"      // MMcPedestalCopy
-#include "MMcPedestalNSBAdd.h"    // MMcPedestalNSBAdd
-
-#include "MSignalCalc.h"          // MPedestalCalc
-#include "MTaskEnv.h"             // MTaskEnv
+#include "MReadMarsFile.h"             // MReadMarsFile
+#include "MGeomApply.h"                // MGeomApply
+#include "MFDataMember.h"              // MFDataMember
+#include "MMcPedestalCopy.h"           // MMcPedestalCopy
+#include "MMcPedestalNSBAdd.h"         // MMcPedestalNSBAdd
+
+#include "MSignalCalc.h"               // MPedestalCalc
+#include "MTaskEnv.h"                  // MTaskEnv
 #include "MExtractTimeAndChargeDigitalFilter.h"
-#include "MImgCleanStd.h"         // MImgCleanStd
-#include "MHillasCalc.h"          // MHillasCalc
-#include "MCalibrationRelTimeCalc.h" // MHillasSrcCalc
-#include "MPrint.h"               // 
-#include "MBadPixelsCalc.h"       // MBadPixelsCalc
-#include "MBadPixelsTreat.h"      // MBadPixelsTreat
-#include "MFillH.h"               // MFillH
-#include "MExtractSignal.h"       // MExtractsignal
-#include "MMcCalibrationUpdate.h" // MMcCalibrationUpdate
-#include "MCalibrateData.h"       // MCalibrateData
-#include "MMuonSearchParCalc.h"   // MMuonSearchParCalc
-#include "MMuonCalibParCalc.h"    // MMuonCalibParCalc
-#include "MContinue.h"            // MContinue
-//#include "MMcTriggerLvl2Calc.h"   // MMcTriggerLvl2Calc
+#include "MImgCleanStd.h"              // MImgCleanStd
+#include "MHillasCalc.h"               // MHillasCalc
+#include "MCalibrationRelTimeCalc.h"   // MCalibrationRelTimeCalc
+#include "MCalibrationPatternDecode.h" // MCalibrationPatternDecode
+#include "MPrint.h"               
+#include "MBadPixelsCalc.h"            // MBadPixelsCalc
+#include "MBadPixelsTreat.h"           // MBadPixelsTreat
+#include "MFillH.h"                    // MFillH
+#include "MExtractSignal.h"            // MExtractsignal
+#include "MMcCalibrationUpdate.h"      // MMcCalibrationUpdate
+#include "MCalibrateData.h"            // MCalibrateData
+#include "MMuonSearchParCalc.h"        // MMuonSearchParCalc
+#include "MMuonCalibParCalc.h"         // MMuonCalibParCalc
+#include "MContinue.h"                 // MContinue
+//#include "MMcTriggerLvl2Calc.h"        // MMcTriggerLvl2Calc
 
 //
 // Container
 //
-#include "MHillas.h"               // MHillas::Print(const MGeomCam&)
-#include "MHillasExt.h"            // MHillasExt::Print(const MGeomCam&)
-#include "MHillasSrc.h"            // MHillasSrc::Print(const MGeomCam&)
-#include "MImagePar.h"             // MImagePar::Print(const MGeomCam&)
-#include "MNewImagePar.h"          // MNewImagePar::Print(const MGeomCam&)
-#include "MHEvent.h"               // MHEvent
-#include "MHCamera.h"              // MHCamera
-#include "MRawEvtData.h"           // MRawEvtData
-#include "MArrivalTimeCam.h"       // MArrivalTimeCam
-#include "MBadPixelsCam.h"         // MBadPixelsCam
-#include "MPedPhotCam.h"           // MPedPhotCam
-#include "MCalibrationChargeCam.h" // MCalibrationChargeCam
-#include "MMuonSearchPar.h"        // MMuonCalibPar
-//#include "MMcTriggerLvl2.h"        // MMcTriggerLvl2
+#include "MHillas.h"                   // MHillas::Print(const MGeomCam&)
+#include "MHillasExt.h"                // MHillasExt::Print(const MGeomCam&)
+#include "MHillasSrc.h"                // MHillasSrc::Print(const MGeomCam&)
+#include "MImagePar.h"                 // MImagePar::Print(const MGeomCam&)
+#include "MNewImagePar.h"              // MNewImagePar::Print(const MGeomCam&)
+#include "MHEvent.h"                   // MHEvent
+#include "MHCamera.h"                  // MHCamera
+#include "MRawEvtData.h"               // MRawEvtData
+#include "MArrivalTimeCam.h"           // MArrivalTimeCam
+#include "MBadPixelsCam.h"             // MBadPixelsCam
+#include "MPedPhotCam.h"               // MPedPhotCam
+#include "MCalibrationChargeCam.h"     // MCalibrationChargeCam
+#include "MMuonSearchPar.h"            // MMuonCalibPar
+//#include "MMcTriggerLvl2.h"            // MMcTriggerLvl2
 
 using namespace std;
@@ -295 +296 @@
         MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
 
+        MCalibrationPatternDecode *decode = new MCalibrationPatternDecode;
+
         MMcCalibrationUpdate* mcupd = new MMcCalibrationUpdate;
         mcupd->SetOuterPixelsGainScaling(kFALSE);
@@ -312 +315 @@
         tlist->AddToList(pcopy);
         tlist->AddToList(pdnsb);
+
+        tlist->AddToList(decode);
 
         tlist->AddToList(nanal);    // Calculated MPedPhotCam