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

Timestamp:

01/10/05 10:45:07 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -113 +113 @@
 MJPedestal::MJPedestal(const char *name, const char *title) 
     : fRuns(0), fExtractor(NULL), fDisplayType(kNormalDisplay),
-      fDataCheck(kFALSE), fExtractType(kUsePedRun)
+      fDataCheck(kFALSE), fExtractType(kUsePedRun), fExtractionType(kFundamental)
 {
     fName  = name  ? name  : "MJPedestal";
@@ -121 +121 @@
     SetUsePedRun();
     SetPathIn("");
-    SetExtractorResolution(kFALSE);
 }
 
@@ -298 +297 @@
       }
     
-    if (fExtractorResolution)
+    if (fExtractionType!=kFundamental/*fExtractorResolution*/)
       {
         for (UInt_t i=0;i<geomcam.GetNumPixels();i++)
@@ -338 +337 @@
     // Display data
     //
-    if (fDisplayType != kDataCheckDisplay && fExtractType != kUseHists && !fExtractorResolution)
+    if (fDisplayType != kDataCheckDisplay && fExtractType != kUseHists && fExtractionType==kFundamental/*fExtractorResolution*/)
       {
         TCanvas &c3 = fDisplay->AddTab("Pedestals");
@@ -381 +380 @@
       {
 
-        TCanvas &c3 = fDisplay->AddTab(fExtractorResolution ? "PedExtrd" : "Ped");
+        TCanvas &c3 = fDisplay->AddTab(fExtractionType!=kFundamental/*fExtractorResolution*/ ? "PedExtrd" : "Ped");
         c3.Divide(2,3);
         
@@ -391 +390 @@
         // for the datacheck, fix the ranges!!
         //
-        if (!fExtractorResolution)
+        if (fExtractionType==kFundamental/*!fExtractorResolution*/)
           {
             obj1->SetMinimum(fgPedestalMin);
@@ -535 +534 @@
       }
     
-    if (fExtractorResolution)
+    if (fExtractionType!=kFundamental/*fExtractorResolution*/)
       {
             
@@ -674 +673 @@
 void MJPedestal::SetExtractor(MExtractor* ext)
 {
-    if (fExtractor)
-        delete fExtractor;
-    fExtractor = ext ? (MExtractor*)ext->Clone(ext->GetName()) : NULL;
+    if (ext)
+    {
+        if (fExtractor)
+            delete fExtractor;
+        fExtractor = ext ? (MExtractor*)ext->Clone(ext->GetName()) : NULL;
+    }
+    else
+        fExtractor = 0;
 }
 
@@ -709 +713 @@
             fExtractType = kUseHists;
 
-    SetExtractorResolution(GetEnv("ExtractorResolution", fExtractorResolution));
+    //fExtractorResolution = GetEnv("ExtractionType", fExtractorResolution);
 
     SetNoStorage(GetEnv("DisableOutput", IsNoStorage()));
@@ -784 +788 @@
         return kTRUE;
 
-    if (!fExtractorResolution || !fExtractor->InheritsFrom("MExtractTimeAndCharge"))
+    if (fExtractionType==kFundamental || !fExtractor->InheritsFrom("MExtractTimeAndCharge"))
         return kFALSE;
 
     extped.SetPedestalsIn(&fPedestalCamIn);
     extped.SetExtractor((MExtractTimeAndCharge*)fExtractor);
+    extped.SetRandomCalculation(fExtractionType==kWithExtractorRndm);
 
     return kTRUE;