Changeset 7189 for trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

Timestamp:

07/14/05 16:03:32 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -174 +174 @@
     }
 
-    TObject *o = file.Get("ExtractSignal");
-    if (o && !o->InheritsFrom(MExtractor::Class()))
-    {
-        *fLog << err << dbginf << "ERROR - ExtractSignal read from " << fname << " doesn't inherit from MExtractor!" << endl;
-        return NULL;
-    }
-
     if (file.FindKey("MBadPixelsCam"))
     {
@@ -190 +183 @@
     }
 
+    if (fExtractor)
+        return fExtractor;
+
+    TObject *o=0;
+    o = file.Get("ExtractSignal");
+    if (o && !o->InheritsFrom(MExtractor::Class()))
+    {
+        *fLog << err << dbginf << "ERROR - ExtractSignal read from " << fname << " doesn't inherit from MExtractor!" << endl;
+        return NULL;
+    }
     return o ? (MExtractor*)o->Clone("ExtractSignal") : NULL;
 }