Changeset 9422 for trunk/MagicSoft/Mars/msimcamera

Timestamp:

04/16/09 10:46:32 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msimcamera

Files:

• MSimBundlePhotons.cc (modified) (1 diff)
• MSimReadout.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/msimcamera/MSimBundlePhotons.cc

@@ -106 +106 @@
     // Make sure that each line has exactly one row
     if (!fLut.HasConstantLength() && fLut.GetMaxEntries()!=1)
-        return kFALSE;
+    {
+        *fLog << err << fFileName << " wrongly formatted." << endl;
+        return kFALSE;
+    }
 
     *fLog << inf << "Using look-up table from " << fFileName << endl;

trunk/MagicSoft/Mars/msimcamera/MSimReadout.cc

@@ -163 +163 @@
     }
 
-    // Get Number of pixels
-    const UInt_t npix = fData->GetNumPixels();
-
-    if (npix!=fCamera->GetNumChannels())
+    // Make sure that we have not more analog channels than pixels
+    // FIXME: Is this really necessary?
+    if (fCamera->GetNumChannels()>fData->GetNumPixels())
     {
         *fLog << err;
         *fLog << "ERROR - Number of analog channels " << fCamera->GetNumChannels();
-        *fLog << " doesn't match number of pixels " << fData->GetNumPixels() << endl;
+        *fLog << " exceeds number of pixels " << fData->GetNumPixels() << endl;
         return kERROR;
     }
@@ -221 +220 @@
 
     // Digitize into a buffer
-    MArrayI buffer(nslices*npix);
+    MArrayI buffer(nslices*fData->GetNumPixels());
 
     // Loop over all channels/pixels
-    for (UInt_t i=0; i<npix; i++)
+    for (UInt_t i=0; i<fCamera->GetNumChannels(); i++)
     {
         // Get i-th canalog hannel