Changeset 7566

Timestamp:

03/03/06 17:06:04 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• ganymed.rc (modified) (1 diff)
• mjobs/MJCut.cc (modified) (3 diffs)
• mpointing/MHSrcPosCam.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
      - fixed the scaling. MSrcPosCam has to be in mm
 
+   * ganymed.rc:
+     - added line and comments with new resource 
+
 
 

trunk/MagicSoft/Mars/NEWS

@@ -26 +26 @@
    - ganymed: now stops in requested source isn't found in catalog file
 
-   - ganymed: fixed plot for Eý.dN/dE. The spectrum was multiplied with two
+   - ganymed: fixed plot for E^2*dN/dE. The spectrum was multiplied with two
      times the bin-width instead of the absolute energy
+
+   - ganymed: added a new option for on-/off-observations
+       MJCut.RandomSourcePosition
+     If switched on the distribution of observation time of the source
+     position in the camera is calculated from the on-data and randomly
+     applied with this distrbution to the off-data.
+
 
 

trunk/MagicSoft/Mars/ganymed.rc

@@ -82 +82 @@
 MHDisp.Smearing: 0.03
 #MHDisp.Wobble:   Yes
+
+# -------------------------------------------------------------------------
+# To get use a random source position in the off data with the distribution
+# in the camera of the on-data
+# -------------------------------------------------------------------------
+#MJCut.RandomSourcePosition: Yes
 
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -655 +655 @@
     taskenv3.SetDefault(fCalcDisp);
 
+    //    MFillH fill0a("OnPos [MHSrcPosCam]", "MSrcPosCam", "FillSrcPosCam");
     MFillH fill1a("MHHillasOffPre  [MHHillas]",      "MHillas",      "FillHillasPre");
     MFillH fill2a("MHHillasOffPost [MHHillas]",      "MHillas",      "FillHillasPost");
@@ -692 +693 @@
     tlist2.AddToList(&scor);
     tlist2.AddToList(&srcrndm);
+    //if (fRndmSrcPos && !fIsWobble)
+    //   tlist2.AddToList(&fill0a);
     tlist2.AddToList(&hcalc);
     if (fIsWobble)
@@ -863 +866 @@
 
     tlist.Replace(&readon);
+    if (fRndmSrcPos && !fIsWobble)
+    {
+//        tlist2.RemoveFromList(&fill0a);
+        tlist2.RemoveFromList(&srcrndm);
+    }
     if (!fWriteOnly)
     {

trunk/MagicSoft/Mars/mpointing/MHSrcPosCam.cc

@@ -137 +137 @@
     }
 
+//    if (fName=="MHSrcPosCam")
+//    {
     fXY += cam->GetXY();
     fNum++;
@@ -149 +151 @@
 
     fHist.Fill(fXY.X(), fXY.Y(), fEffOnTime->GetVal());
+//    }
+//    else
+//        fHist.Fill(cam->GetX()*fConvMm2Deg, cam->GetY()*fConvMm2Deg);
 
     fXY            = TVector2();
@@ -159 +164 @@
 void MHSrcPosCam::Paint(Option_t *)
 {
-    MH::SetPalette("glow1");
+    MH::SetPalette("glow1", 99);
 }