Changeset 5871 for trunk/MagicSoft

Timestamp:

01/17/05 13:45:41 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -932 +932 @@
     if (fExtractor)
     {
-        if (!fExtractor->InheritsFrom("MExtractTimeAndCharge"))
+      const Float_t f = 0.5+fExtractor->GetHiGainFirst();
+      const Float_t n = 0.5+fExtractor->GetNumHiGainSamples();
+      pedcalc.SetExtractWindow((Int_t)f, (Int_t)n);
+      pedlogain.SetExtractWindow((Int_t)(15+f), (Int_t)n);
+            
+      if (!fExtractor->InheritsFrom("MExtractTimeAndCharge"))
         {
-            const Float_t f = 0.5+fExtractor->GetHiGainFirst();
-            const Float_t n = 0.5+fExtractor->GetNumHiGainSamples();
-            pedcalc.SetExtractWindow((Int_t)f, (Int_t)n);
-            pedlogain.SetExtractWindow((Int_t)(15+f), (Int_t)n);
-
-            if (fExtractionType!=kFundamental)
+          if (fExtractionType!=kFundamental)
             {
-                *fLog << inf;
-                *fLog << "Signal extractor doesn't inherit from MExtractTimeAndCharge..." << endl;
-                *fLog << " --> falling back to fundamental pedestal extraction." << endl;
-                fExtractionType=kFundamental;
+              *fLog << inf;
+              *fLog << "Signal extractor doesn't inherit from MExtractTimeAndCharge..." << endl;
+              *fLog << " --> falling back to fundamental pedestal extraction." << endl;
+              fExtractionType=kFundamental;
             }
         }
-
-        if (fExtractionType!=kFundamental)
+      
+      if (fExtractionType!=kFundamental)
         {
-            pedcalc.SetRandomCalculation(fExtractionType==kWithExtractorRndm);
-            pedlogain.SetRandomCalculation(fExtractionType==kWithExtractorRndm);
-
-            pedcalc.SetExtractor((MExtractTimeAndCharge*)fExtractor);
-            pedlogain.SetExtractor((MExtractTimeAndCharge*)fExtractor);
+          pedcalc.SetRandomCalculation(fExtractionType==kWithExtractorRndm);
+          pedlogain.SetRandomCalculation(fExtractionType==kWithExtractorRndm);
+          
+          pedcalc.SetExtractor((MExtractTimeAndCharge*)fExtractor);
+          pedlogain.SetExtractor((MExtractTimeAndCharge*)fExtractor);
         }
     }