Changeset 8498 for trunk/MagicSoft/Mars/mjobs

Timestamp:

05/11/07 16:47:18 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibTest.cc (modified) (2 diffs)
• MJCalibrateSignal.cc (modified) (5 diffs)
• MJCalibration.cc (modified) (1 diff)
• MJPedestal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -396 +396 @@
   MExtractTimeAndChargeSpline spline;
 
-  spline.SetPedestals(&pedcam);
-
   MTaskEnv taskenv1("ExtractSignal");
   MTaskEnv taskenv2("ExtractTime");
 
   if (extractor1)
-    { 
-      extractor1->SetPedestals(&pedcam);
       taskenv1.SetDefault(extractor1);
-    }
 
   if (extractor2)
-    {
-      fTimeExtractor->SetPedestals(&pedcam);
       taskenv2.SetDefault(fTimeExtractor);
-    }
   else if (!(extractor1->InheritsFrom("MExtractTimeAndCharge")))
     {
-      spline.SetPedestals(&pedcam);
       spline.SetWindowSize(8,8);
       taskenv2.SetDefault(&spline);
@@ -544 +535 @@
 
 }
-

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -418 +418 @@
     pedlo2.SetPedestalUpdate(kTRUE);
     pedlo2.SetRandomCalculation(kTRUE);
-    pedlo2.SetNamePedestalCamIn("MPedestalFundamental");
     pedlo2.SetNamePedestalCamOut("MPedestalFromExtractorRndm");
 
@@ -424 +423 @@
     pedlo3.SetPedestalUpdate(kTRUE);
     pedlo3.SetRandomCalculation(kFALSE);
-    pedlo3.SetNamePedestalCamIn("MPedestalFundamental");
     pedlo3.SetNamePedestalCamOut("MPedestalFromExtractor");
 
@@ -432 +430 @@
         return kFALSE;
     }
-
-    extractor1->SetPedestals(&pedcamab);
 
     // Setup to use the hi-gain extraction window in the lo-gain
@@ -460 +456 @@
     }
 
-    if (extractor2)
-        extractor2->SetPedestals(&pedcamab);
-
-    if (extractor3)
-        extractor3->SetPedestals(&pedcamab);
-
     //------------------------------
     MFTriggerPattern ftp2;
@@ -530 +520 @@
     MCalibCalcFromPast      pacalc;
 
-    pinext.SetPedestals(&pedcamab);
-    bldext.SetPedestals(&pedcamab);
     chcalc.SetPedestals(&pedcamextr);
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1802 +1802 @@
     // Produce pedestal subtracted raw-data
     MPedestalSubtract pedsub;
-    pedsub.SetPedestalCam(fExtractor->GetPedestals());
     tlist.AddToList(&pedsub);
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -1188 +1188 @@
     }
 
-    pedcalc.SetPedestalsIn(&fPedestalCamIn);
-    pedlogain.SetPedestalsIn(&fPedestalCamIn);
-
     pedcalc.SetPedestalsOut(&fPedestalCamOut);
     pedlogain.SetPedestalsOut(&fPedestalCamOut);
@@ -1197 +1194 @@
     if (fExtractor)
     {
-        fExtractor->SetPedestals(&fPedestalCamIn);
-
         if (fExtractionType!=kFundamental)
         {