Changeset 8301

Timestamp:

02/04/07 11:22:51 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibration.cc (modified) (3 diffs)
• MJPedestal.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1488 +1488 @@
     }
 
+    // Defined resource id
+    const TString id = IsUseMC() ? "MC" : Form("%02d", period);
+
     // Check for a valid entry for the correct period
-    TString fname = env.GetValue(Form("%02d", period), "");
+    TString fname = env.GetValue(id, "");
     if (fname.IsNull())
     {
-        *fLog << err << "ERROR - No entry for period " << period;
-        *fLog << " found in " << fHiLoCalibFile << "... looking for default." << endl;
+        *fLog << err << "ERROR - No entry for resource id '" << id;
+        *fLog << "' found in " << fHiLoCalibFile << "... looking for default." << endl;
         return kFALSE;
 /*
@@ -1618 +1621 @@
     fHiLoCalibFile = GetEnv("HiLoCalibFile",fHiLoCalibFile.Data());
 
+    /*
     if (IsUseMC() && !fHiLoCalibFile.EndsWith("_mc.root"))
     {
@@ -1628 +1632 @@
             fHiLoCalibFile.Insert(fHiLoCalibFile.Length()-5, "_mc");
     }
+    */
 
     return ReadHiLoCalibFile();

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -1066 +1066 @@
     
     MHPedestalCam hpedcam;
+    hpedcam.SetPedestalsOut(&fPedestalCamOut);
     if (fExtractionType != kFundamental)
-      hpedcam.SetRenorm(kTRUE);
-    //    fPedestalHist.SetRenorm(kTRUE);
-    //    fPedestalHist.SetPedestalsOut(&fPedestalCamOut);
-    hpedcam.SetPedestalsOut(&fPedestalCamOut);
-
-    MPedestalCam pedinter;
-    pedinter.SetName("MPedestalCamIntermediate");
-
-    MFillH fillped(&hpedcam, "MPedestalCamIntermediate", "FillPedCam");
-    //    MFillH fillped(&fPedestalHist, "MPedestalCamIntermediate", "FillPedCam");
+        hpedcam.SetRenorm(kTRUE);
+
     MFillH fillpul("MHCalibrationPulseTimeCam", "MRawEvtData", "FillPulseTime");
-    fillped.SetBit(MFillH::kDoNotDisplay);
     fillpul.SetBit(MFillH::kDoNotDisplay);
 
@@ -1161 +1153 @@
           }
         
-        pedcalc.SetIntermediateStorage();
-        pedlogain.SetIntermediateStorage();
-        plist.AddToList(&pedinter);
         plist.AddToList(&hpedcam);
-        //        plist.AddToList(&fPedestalHist);
-        tlist.AddToList(&fillped);
     }
 
@@ -1172 +1159 @@
     pedlogain.SetPedestalsIn(&fPedestalCamIn);
 
-    pedcalc.SetPedestalsInter(&pedinter);
-    pedlogain.SetPedestalsInter(&pedinter);
     pedcalc.SetPedestalsOut(&fPedestalCamOut);
     pedlogain.SetPedestalsOut(&fPedestalCamOut);