Changeset 12527 for fact

Timestamp:

11/15/11 20:54:13 (13 years ago)

Author:

neise

Message:

faster abort in case of wrong ROI calib file

File:

• fact/tools/rootmacros/fbsl.C (modified) (3 diffs)

fact/tools/rootmacros/fbsl.C

@@ -134 +134 @@
 
   BookHistos( RegionOfInterest, npixel );
-    
+        size_t calib_RC = 1;
+ 
                 // loop over events
     for ( int ev = firstevent; ev < firstevent + nevents; ev++) {
@@ -151 +152 @@
                         // apply the Drs Calibration and cut off 12 slices at the beginning
                         // and at the end.
-                        applyDrsCalibration( Ameas,pix,12,12,
+                        calib_RC = applyDrsCalibration( Ameas,pix,12,12,
                                 Offset, Gain, TriggerOffset,
                                 RegionOfInterest, Data, StartCells);
+                        if (calib_RC == 0){
+                                break;
+                        }
 
                         // finds spikes in the raw data, and interpolates the value
@@ -168 +172 @@
             }   
             }
-        }
+
+                        if (calib_RC == 0){
+                                break;
+                        }
+        
+        }
+
+
+                        if (calib_RC == 0){
+                                cout << "DRS Calibration didn't work ... aborting" << endl;
+                                return 2;
+                        }
 
     FILE *fp;