Changeset 6992 for trunk/MagicSoft

Timestamp:

05/03/05 13:50:24 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCut.cc (modified) (2 diffs)
• mpointing/MSrcPosCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/05/03 Thomas Bretz
+
+   * mjobs/MJCut.cc:
+     - added histogram <Fake->'OnTime' for MC
+
+   * mpointing/MSrcPosCalc.cc:
+     - removed dependancy on MTime for MC
+
+
 
  2005/05/02 Thomas Bretz

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -651 +651 @@
     hvs.SetTitle("Effective On-Time vs. Zenith Angle;\\Theta [\\circ];T_{on} [s]");
     MFillH fillvs(&hvs, "", "FillOnTime");
-    fillvs.SetWeight("MEffectiveOnTime");
+    if (!fIsMonteCarlo)
+        fillvs.SetWeight("MEffectiveOnTime");
     fillvs.SetNameTab("OnTime");
 
@@ -703 +704 @@
         if (!fIsMonteCarlo)
             tlist.AddToList(&fillvs, "EffectiveOnTime");
+        else
+            tlist2.AddToListBefore(&fillvs, &scalc);
     }
 

trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc

@@ -188 +188 @@
     }
 
-    fObservatory = (MObservatory*)pList->FindObject("MObservatory");
-    if (!fObservatory)
-    {
-        *fLog << err << "MObservatory not found... aborting." << endl;
-        return kFALSE;
-    }
-
-    fTime = (MTime*)pList->FindObject("MTime");
-    if (!fTime)
-    {
-        *fLog << err << "MTime not found... aborting." << endl;
-        return kFALSE;
-    }
-
     *fLog << inf;
     //*fLog << "Pointing Position: " << GetRaDec(*fPointPos)  << endl;
@@ -247 +233 @@
 
     if (fRunType!=MRawRunHeader::kRTMonteCarlo)
+    {
+        fObservatory = (MObservatory*)plist->FindObject("MObservatory");
+        if (!fObservatory)
+        {
+            *fLog << err << "MObservatory not found... aborting." << endl;
+            return kFALSE;
+        }
+        fTime = (MTime*)plist->FindObject("MTime");
+        if (!fTime)
+        {
+            *fLog << err << "MTime not found... aborting." << endl;
+            return kFALSE;
+        }
         return kTRUE;
+    }
 
     MMcCorsikaRunHeader *h = (MMcCorsikaRunHeader*)plist->FindObject("MMcCorsikaRunHeader");