Changeset 9347 for trunk/MagicSoft/Mars/msimcamera

Timestamp:

02/18/09 12:07:41 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msimcamera

Files:

• MSimGeomCam.cc (modified) (6 diffs)
• MSimSignalCam.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/msimcamera/MSimGeomCam.cc

@@ -37 +37 @@
 //   MPhotonEvent
 //   fNameGeomCam [MGeomCam]
-//   IntendedTrigPos [MParameterD]
 //   MRawRunHeader
+//   [IntendedPulsePos [MParameterD]]
+//   [MPulseShape]
 //
 //  Output Containers:
@@ -103 +104 @@
 
     fPulse = (MPulseShape*)pList->FindObject("MPulseShape");
+/*
     if (!fPulse)
     {
@@ -108 +110 @@
         return kFALSE;
     }
-
+ */
     fPulsePos = (MParameterD*)pList->FindObject("IntendedPulsePos", "MParameterD");
+/*
     if (!fPulsePos)
     {
@@ -115 +118 @@
         return kFALSE;
     }
-
+*/
     fHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
     if (!fHeader)
@@ -168 +171 @@
 
     // ------ FIXME: Move somewhere else? MSimCalibrationSignal ------
-
+/*
     if (!fEvt->IsSorted())
     {
-        *fLog << err << "ERROR - MPhotonEvent must be sorted!" << endl;
+        *fLog << err << "ERROR - MSimGeomCam: MPhotonEvent must be sorted!" << endl;
         return kERROR;
     }
-
+ */
     const Float_t freq = fHeader->GetFreqSampling()/1000.;
 
@@ -185 +188 @@
 
     // Length (ns), Pulse position (Units ns)
-    const Float_t pp   = fPulsePos->GetVal();
-    const Float_t pw   = fPulse->GetPulseWidth();
+    const Float_t pp   = fPulsePos ? fPulsePos->GetVal()     : 0;
+    const Float_t pw   = fPulse    ? fPulse->GetPulseWidth() : 0;
 
     fStat->SetTimeMedDev(fEvt->GetTimeMedianDev());

trunk/MagicSoft/Mars/msimcamera/MSimSignalCam.cc

@@ -35 +35 @@
 //   MPhotonEvent
 //   MPhotonStatistics
+//   [TriggerPos [MParameterD]]
 //
 //  Output Containers:
@@ -90 +91 @@
 
     fTrigger = (MParameterD*)pList->FindObject("TriggerPos", "MParameterD");
+/*
     if (!fTrigger)
     {
@@ -95 +97 @@
         return kFALSE;
     }
-
+*/
     fSignal = (MSignalCam*)pList->FindCreateObj("MSignalCam");
     if (!fSignal)
@@ -111 +113 @@
 {
     const UInt_t npix = fSignal->GetNumPixels();
+
+    if (npix==0)
+    {
+        *fLog << err << "ERROR - MSignalCam has 0 entries. Presumably MGeomApply::ReInit not done." << endl;
+        return kFALSE;
+    }
 
     if (fCont.GetSize()!=npix)
@@ -163 +171 @@
     // What about events with trigger<0?
     const Float_t trig  = fTrigger && fTrigger->GetVal()>=0 ? fTrigger->GetVal()  : 0;
-    const Float_t first = fStat->GetTimeFirst()+trig /*+50+40*/;
+    const Float_t first = fStat->GetTimeFirst()+trig;
 
     // Loop over all pixels and set signal and arrival time.