Changeset 2944

Timestamp:

01/28/04 14:53:30 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MArrivalTimeCalc.cc (modified) (1 diff)
• manalysis/MExtractSignal.cc (modified) (2 diffs)
• manalysis/MGeomApply.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -11 +11 @@
        method was OK. Up to now, program stopped, if one of the two 
        methods was chosen but not able to being executed.
- 
+
+   * manalysis/MArrivalTimeCalc.cc
+   * manalysis/MExtractSignals.cc
+   * manalysis/MGeomApply.cc
+     - put all missing InitSize(npixels) into MGeomApply         
+
 
  2004/01/28: Abelardo Moralejo

trunk/MagicSoft/Mars/manalysis/MArrivalTimeCalc.cc

@@ -110 +110 @@
     }
 
-    fArrTime->InitSize(cam->GetNumPixels());
-
     return kTRUE;
 }

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -135 +135 @@
 Bool_t MExtractSignal::ReInit(MParList *pList )
 {
+
     MGeomCam *cam = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
     if (!cam)
@@ -142 +143 @@
     }
 
-    // FIXME: This solution may change in the future, MExtractedSignal
-    //        must be similar to MCerPhotEvt not to MPedestalCam
-    //        (Have to think about the mean size of both solutions)
-    fSignals->InitSize(cam->GetNumPixels());    
-
-    fArrivalTime->InitSize(cam->GetNumPixels());
-
-    return kTRUE;
+  return kTRUE;
 }
 

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -61 +61 @@
 #include "MCalibrationCam.h"
 #include "MPedPhotCam.h"
+#include "MArrivalTime.h"
+#include "MExtractedSignalCam.h"
 #include "MBlindPixels.h"
 
@@ -130 +132 @@
 
 
+    MExtractedSignalCam *ext = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
+    if (ext)
+      ext->InitSize(cam->GetNumPixels());
+
     MBlindPixels *bnd = (MBlindPixels*)pList->FindObject(AddSerialNumber("MBlindPixels"));
     if (bnd)
         bnd->InitSize(cam->GetNumPixels());
+
+    MArrivalTime *tme = (MArrivalTime*)pList->FindObject(AddSerialNumber("MArrivalTime"));
+    if (tme)
+        tme->InitSize(cam->GetNumPixels());
 
     return kTRUE;