Changeset 9270

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MEventRateCalc.cc (modified) (1 diff)
• mbase/MParEnv.cc (modified) (1 diff)
• melectronics/MAnalogChannels.cc (modified) (2 diffs)
• melectronics/MAnalogChannels.h (modified) (2 diffs)
• mraw/MRawRunHeader.cc (modified) (2 diffs)
• mraw/MRawRunHeader.h (modified) (1 diff)
• msimcamera/MSimReadout.cc (modified) (7 diffs)
• msimcamera/MSimReadout.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MEventRateCalc.cc

@@ -141 +141 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// This resets the calculation whenever a new file is opened.
+//
 Bool_t MEventRateCalc::ReInit(MParList *pList)
 {

trunk/MagicSoft/Mars/mbase/MParEnv.cc

@@ -165 +165 @@
         rc = kTRUE;
         TString cls = GetEnvValue(env, prefix, "Class", "");
-        cont = GetNewObject(fName, cls);
+        cont = GetNewObject(cls, fClassName);
     }
 

trunk/MagicSoft/Mars/melectronics/MAnalogChannels.cc

@@ -134 +134 @@
 // Return the number of channels.
 //
-Int_t MAnalogChannels::GetNumChannels() const
+UInt_t MAnalogChannels::GetNumChannels() const
 {
     return fArray ? fArray->GetEntriesFast() : 0;
@@ -143 +143 @@
 // Return the number of samples per channel
 //
-Int_t MAnalogChannels::GetNumSamples() const
+UInt_t MAnalogChannels::GetNumSamples() const
 {
     return operator()(0) ? operator()(0)->GetSize() : 0;

trunk/MagicSoft/Mars/melectronics/MAnalogChannels.h

@@ -29 +29 @@
     void Init(UInt_t n, UInt_t len);
 
+    void InitNumChannels(UInt_t n) { Init(n, GetNumSamples());  }
+    void InitLenChannels(UInt_t l) { Init(GetNumChannels(), l); }
+
     MAnalogSignal &operator[](UInt_t i);
     MAnalogSignal *operator()(UInt_t i);
@@ -35 +38 @@
     const MAnalogSignal *operator()(UInt_t i) const;
 
-    Int_t GetNumChannels() const;
-    Int_t GetNumSamples() const;
+    UInt_t GetNumChannels() const;
+    UInt_t GetNumSamples() const;
 
     void SetValidRange(Int_t min, Int_t max) { fValidRangeMin=min; fValidRangeMax=max; }

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -1151 +1151 @@
 //  Init a camera
 //
-void MRawRunHeader::InitCamera(UShort_t type)
+void MRawRunHeader::InitCamera(UShort_t type, UShort_t pix)
 {
     switch (type)
@@ -1163 +1163 @@
         fNumPixInCrate = 703;
         break;
+    case (UShort_t)-1:
+        fNumCrates     =   1;
+        fNumPixInCrate = pix;
+        break;
     }
 

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -100 +100 @@
 */
     void InitFadcType(UShort_t type);
-    void InitCamera(UShort_t type);
+    void InitCamera(UShort_t type, UShort_t pix=0);
+    void InitPixels(UShort_t pix) { InitCamera((UShort_t)-1, pix); }
     void SetRunInfo(UShort_t type, UShort_t tel, UInt_t run, UInt_t file=0);
     void SetSourceInfo(const char src[80], char epoch='J', UShort_t date=2000);

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: