Changeset 9270 for trunk/MagicSoft/Mars/msimcamera

Timestamp:

01/26/09 11:59:12 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msimcamera

Files:

• MSimReadout.cc (modified) (7 diffs)
• MSimReadout.h (modified) (1 diff)

trunk/MagicSoft/Mars/msimcamera/MSimReadout.cc

@@ -33 +33 @@
 //
 //  Input Containers:
+//   MGeomCam
 //   MAnalogChannels
 //   TriggerPos [MParameterD]
@@ -53 +54 @@
 #include "MParameters.h"
 
+#include "MGeomCam.h"
+
 #include "MRawRunHeader.h"
 #include "MRawEvtHeader.h"
@@ -104 +107 @@
     }
 
-
     fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
     if (!fRunHeader)
@@ -112 +114 @@
     }
 
-    // -----------------------------------------------------------------------
-
     fData = (MRawEvtData*)pList->FindCreateObj("MRawEvtData");
     if (!fData)
         return kFALSE;
+
+    return kTRUE;
+}
+
+Bool_t MSimReadout::ReInit(MParList *plist)
+{
+    MGeomCam *cam = (MGeomCam*)plist->FindObject("MGeomCam");
+    if (!cam)
+    {
+        *fLog << err << "MGeomCam not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fRunHeader->InitPixels(cam->GetNumPixels());
 
     fData->InitRead(fRunHeader);
@@ -134 +148 @@
     if (fData->GetNumLoGainSamples()>0)
     {
-        *fLog << err << "ERROR - Lo-gains not implemented yet." << endl;
+        *fLog << err << "ERROR - MSimReadout: Lo-gains not implemented yet." << endl;
         return kERROR;
     }
@@ -141 +155 @@
     const UInt_t npix = fData->GetNumPixels();
 
-    // Sanity check
-    if (fData->GetNumPixels()!=fCamera->GetNumChannels())
-    {
-        *fLog << err << "ERROR - Number of analog channels doen't match number of pixels." << endl;
+    if (npix!=fCamera->GetNumChannels())
+    {
+        *fLog << err;
+        *fLog << "ERROR - Number of analog channels " << fCamera->GetNumChannels();
+        *fLog << " doesn't match number of pixels " << fData->GetNumPixels() << endl;
         return kERROR;
     }
@@ -150 +165 @@
     if (fTrigger->GetVal()<0)
     {
-        *fLog << err << "ERROR - MSimReadout executed for an event which has no trigger." << endl;
+        *fLog << err << "ERROR - MSimReadout: MSimReadout executed for an event which has no trigger." << endl;
         return kERROR;
     }

trunk/MagicSoft/Mars/msimcamera/MSimReadout.h

@@ -23 +23 @@
 
     // MTask
-    Int_t PreProcess(MParList *pList);
-    Int_t Process();
+    Int_t  PreProcess(MParList *pList);
+    Int_t  Process();
+    Bool_t ReInit(MParList *pList);
 
 public: