Changeset 18282 for branches/MarsGapdTimeJitter/msimcamera

Timestamp:

08/18/15 10:28:44 (9 years ago)

Author:

Jens Buss

Message:

merged Trunk into Branch

Location:

branches/MarsGapdTimeJitter

Files:

• . (modified) (1 prop)
• msimcamera/MSimCamera.cc (modified) (1 diff)

branches/MarsGapdTimeJitter/msimcamera/MSimCamera.cc

@@ -155 +155 @@
     }
     // Check all entries for inf and nan. Those are not accepted here.
-    for( std::vector< double > row : fFixTimeOffsetsBetweenPixelsInNs->fM ){
-        for( double number : row){
-
-            if( std::isnan(number) || std::isinf(number) ){
-
+    for( int row_index=0; row_index<fFixTimeOffsetsBetweenPixelsInNs->fM.size(); row_index++){
+        std::vector<double> row = fFixTimeOffsetsBetweenPixelsInNs->fM.at(row_index);
+        for( int col_index=0; col_index<row.size(); col_index++){
+            double specific_delay = row.at(col_index);
+            if( std::isnan(specific_delay) || std::isinf(specific_delay) ){
                 *fLog << err << "In Source: "<< __FILE__ <<" in line: ";
                 *fLog << __LINE__;
                 *fLog << " in function: "<< __func__ <<"\n";
-                *fLog << "There is a non normal number in the fix temporal ";
-                *fLog << "pixel offsets. This is at least one number is ";
-                *fLog << "NaN or Inf. This here is >"<< number;
+                *fLog << "There is a non normal specific_delay in the fix temporal ";
+                *fLog << "pixel offsets. This is that at least one specific_delay is ";
+                *fLog << "NaN or Inf. This here is >"<< specific_delay;
                 *fLog << "<... aborting." << endl;               
                 return kFALSE;
             }
         }
+
     }
     // -------------------------------------------------------------------