Changeset 2659 for trunk/MagicSoft

Timestamp:

12/11/03 20:33:02 (21 years ago)

Author:

raducci

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MArrivalTimeCalc.cc (modified) (4 diffs)
• manalysis/MArrivalTimeCalc.h (modified) (1 diff)
• mhist/MHEvent.cc (modified) (3 diffs)
• mmain/MEventDisplay.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MArrivalTimeCalc.cc

@@ -37 +37 @@
 //
 // Output Containers:
-//   MArrivalTime
-//
+//   //MArrivalTime
+//   MRawEvtData
 //////////////////////////////////////////////////////////////////////////////
 
-#include "MArrivalTime.h"
+//#include "MArrivalTime.h"
 #include "MArrivalTimeCalc.h"
 
@@ -82 +82 @@
 //  - MRawRunHeader
 //  - MRawEvtData
-//  - MArrivalTime
+//  //- MArrivalTime
 //  - MGeomCam
 //
 // The following output containers are also searched and created if
 // they were not found:
-//  - MArrivalTime
+//  //- MArrivalTime
+//  - MRawEvtData
 //
+
 Int_t MArrivalTimeCalc::PreProcess(MParList *pList)
 {
@@ -112 +114 @@
     }
 
-    fArrTime = (MArrivalTime*)pList->FindCreateObj(AddSerialNumber("MArrivalTime"));
+/*    fArrTime = (MArrivalTime*)pList->FindCreateObj(AddSerialNumber("MArrivalTime"));
     if (!fArrTime)
         return kFALSE;
-
+*/
     return kTRUE;
 }
@@ -128 +130 @@
     MRawEvtPixelIter pixel(fRawEvt);
 
-    fArrTime->Calc((const MRawEvtData&) *fRawEvt,(const MGeomCam&) *fGeom);
+  //fArrTime->Calc((const MRawEvtData&) *fRawEvt,(const MGeomCam&) *fGeom);
+  //fArrTime->SetReadyToSave();
 
-    fArrTime->SetReadyToSave();
-
+  //while (pixel.Next()){;}
+   
     return kTRUE;
 }

trunk/MagicSoft/Mars/manalysis/MArrivalTimeCalc.h

@@ -27 +27 @@
     MRawRunHeader  *fRunHeader;  // RunHeader information
     MGeomCam       *fGeom;       // Geometry information
-    MArrivalTime   *fArrTime;    // Container with the photons arrival times
+//  MArrivalTime   *fArrTime;    // Container with the photons arrival times
 
     Bool_t          fEnableFix;  // fix for a bug in files from older camera versions (<=40)

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -152 +152 @@
         fHist->SetName("Arrival Time");
         fHist->SetYTitle("t [slice id]");
+        fHist->SetPrettyPalette();
         break;
     }
@@ -172 +173 @@
     {
     case kEvtSignal:
-    case kEvtArrTime:
     case kEvtPedestal:
         fHist->SetCamContent(*(MCamEvent*)par, 0);
@@ -191 +191 @@
         }
         break;
+    case kEvtArrTime:
+        fHist->SetCamContent(*(MCamEvent*)par, 5);
+        break;
+    
     }
 

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -81 +81 @@
 #include "MHCamera.h"            // MHCamera
 #include "MRawEvtData.h"         // MRawEvtData
-#include "MArrivalTime.h"        // MArrivalTime
+//#include "MArrivalTime.h"        // MArrivalTime
 
 
@@ -208 +208 @@
     MHillasSrcCalc    *scalc = new MHillasSrcCalc;
     MArrivalTimeCalc  *tcalc = new MArrivalTimeCalc;
-    MFillH            *fill7 = new MFillH(evt7, "MArrivalTime",  "MFillH7");
+    MFillH            *fill7 = new MFillH(evt7, "MRawEvtData",  "MFillH7");