Changeset 5842 for trunk/MagicSoft

Timestamp:

01/14/05 14:54:56 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJPedestal.cc (modified) (2 diffs)
• MJPedestal.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -947 +947 @@
             }
         }
-        else
-        {
-            pedcalc.SetExtractor((MExtractTimeAndCharge*)fExtractor);
-            pedlogain.SetExtractor((MExtractTimeAndCharge*)fExtractor);
-        }
 
         if (fExtractionType!=kFundamental)
@@ -957 +952 @@
             pedcalc.SetRandomCalculation(fExtractionType==kWithExtractorRndm);
             pedlogain.SetRandomCalculation(fExtractionType==kWithExtractorRndm);
+
+            pedcalc.SetExtractor((MExtractTimeAndCharge*)fExtractor);
+            pedlogain.SetExtractor((MExtractTimeAndCharge*)fExtractor);
         }
     }

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -67 +67 @@
     //Bool_t WriteEventloop(MEvtLoop &evtloop) const;
 
-    Bool_t SetupExtractor(MParList &plist, MExtractPedestal &extped);
-
     void   DisplayResult(MParList &plist);
     void   DisplayReferenceLines(MHCamera *cam, const Int_t what) const;