Changeset 6887 for trunk/MagicSoft/Mars/mjobs

Timestamp:

03/24/05 11:14:13 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibration.cc (modified) (2 diffs)
• hilocalib_df46.root (modified) ( previous)
• hilocalib_df46_mc.root (added)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1477 +1477 @@
 {
 
-  if (!fIsHiLoCalibration || IsUseMC())
+  if (!fIsHiLoCalibration)
     return kTRUE;
 
@@ -1582 +1582 @@
 
     fHiLoCalibFile = GetEnv("HiLoCalibFile",fHiLoCalibFile.Data());
+
+    if (IsUseMC() && !fHiLoCalibFile.EndsWith("_mc.root"))
+    {
+        if (!fHiLoCalibFile.EndsWith(".root"))
+        {
+            *fLog << warn << "WARNING - Hi-/Lo-Gain intercalibration file ";
+            *fLog << fHiLoCalibFile << " has not .root as extension..." << endl;
+        }
+        else
+            fHiLoCalibFile.Insert(fHiLoCalibFile.Length()-5, "_mc");
+    }
 
     return ReadHiLoCalibFile();