Changeset 8315 for trunk/MagicSoft/Mars/mjobs

Timestamp:

02/13/07 11:15:29 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -1050 +1050 @@
     plist.AddToList(&fBadPixels);
     
-    //
-    // Read bad pixels from outside
-    // 
-    if (!fBadPixelsFile.IsNull())
-    {
-        *fLog << inf << "Excluding: " << fBadPixelsFile << endl;
-        ifstream fin(fBadPixelsFile);
-        fBadPixels.AsciiRead(fin);
-    }
-
     MGeomApply geomapl;
     MBadPixelsMerge merge(&fBadPixels);
@@ -1094 +1084 @@
         fExtractor->Print();
         *fLog << endl;
+    }
+
+    //
+    // Read bad pixels from outside
+    // 
+    if (!fBadPixelsFile.IsNull())
+    {
+        *fLog << inf << "Excluding: " << fBadPixelsFile << endl;
+        ifstream fin(fBadPixelsFile);
+        fBadPixels.AsciiRead(fin);
     }