Changeset 9000

Timestamp:

07/14/08 22:25:59 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mpointing/MHSrcPosCam.cc (modified) (6 diffs)
• mpointing/MHSrcPosCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -72 +72 @@
    * mraw/RawLinkDef.h, mraw/Makefile:
      - removed MRawSocketRead
+
+   * mpointing/MHSrcPosCam.[h,cc]:
+     - fixed ouput in case a container is not found
+     - made it work for monte carlos, too
+     - use weight when filling histogram
+     - changed circle line styles
+     - changed default in constructor to wobble=kTRUE
 
 

trunk/MagicSoft/Mars/mpointing/MHSrcPosCam.cc

@@ -89 +89 @@
 Bool_t MHSrcPosCam::SetupFill(const MParList *pl)
 {
-    fTimeEffOn = (MTime*)pl->FindObject("MTimeEffectiveOnTime");
-    if (!fTimeEffOn)
-    {
-        *fLog << err << "ERROR - MTimeEffOnTime not found... aborting." << endl;
-        return kFALSE;
-    }
-
     MGeomCam *geom = (MGeomCam*)pl->FindObject("MGeomCam");
     if (!geom)
@@ -103 +96 @@
     }
 
+    fTimeEffOn = (MTime*)      pl->FindObject("MTimeEffectiveOnTime");
     fEffOnTime = (MParameterD*)pl->FindObject("MEffectiveOnTime");
-    if (!fEffOnTime)
+
+    if (!fTimeEffOn && fEffOnTime)
+    {
+        *fLog << err << "ERROR - MTimeEffOnTime not found... aborting." << endl;
+        return kFALSE;
+    }
+    if (!fEffOnTime && fTimeEffOn)
     {
         *fLog << err << "ERROR - MEffectiveOnTime not found... aborting." << endl;
@@ -110 +110 @@
     }
 
-    MPointingPos *pos = (MPointingPos*)pl->FindObject("MSourcePos", "MPointingPos");
-    if (!pos)
-    {
-        *fLog << warn << "ERROR - MSourcePos not found... aborting." << endl;
-        return kFALSE;
-    }
-
-    const TString src = pos->GetString("radec");
+    if (!fEffOnTime && !fTimeEffOn)
+        *fLog << inf << "Neither MTimeEffOnTime nor MEffectiveOnTime found... assuming MC." << endl;
+    else
+        fTimeLastEffOn = MTime();
+
+    const MPointingPos *pos = (MPointingPos*)pl->FindObject("MSourcePos", "MPointingPos");
+
+    const TString src = pos ? pos->GetString("radec") : "MonteCarlo";
     fHist.SetTitle(MString::Format("SrcPos distribution in camera: %s", src.Data()));
 
     fHist.Reset();
-    fTimeLastEffOn = MTime();
-    fConvMm2Deg    = geom->GetConvMm2Deg();
-    fNum           = 0;
+    fConvMm2Deg = geom->GetConvMm2Deg();
+    fNum        = 0;
 
     return kTRUE;
@@ -145 +144 @@
     }
 
+    if (!fEffOnTime)
+    {
+        const TVector2 v(cam->GetXY()*fConvMm2Deg);
+        fHist.Fill(v.X(), v.Y(), w);
+        return kTRUE;
+    }
+
     // Increase array size if necessary
     if (fNum==fPositions.GetSize())
@@ -167 +173 @@
     {
         const TVector2 &v = (TVector2&)*fPositions[i];
-        fHist.Fill(v.X(), v.Y(), scale);
+        fHist.Fill(v.X(), v.Y(), scale*w);
     }
 
@@ -205 +211 @@
     if (fHist.GetXaxis()->GetXmax()>0.5)
     {
+        // Typical wobble distance +/- 1 shaftencoder step
         TEllipse el;
         el.SetFillStyle(4000);
-        el.SetLineColor(kMagenta);
+        el.SetLineColor(kBlack);
+        el.SetLineStyle(kDashed);
         el.DrawEllipse(0, 0, 0.4, 0, 0, 360, 0);
-    }
-}
-
+        el.SetLineColor(17);
+        el.DrawEllipse(0, 0, 0.4-0.022, 0, 0, 360, 0);
+        el.DrawEllipse(0, 0, 0.4+0.022, 0, 0, 360, 0);
+    }
+}
+

trunk/MagicSoft/Mars/mpointing/MHSrcPosCam.h

@@ -37 +37 @@
 
 public:
-    MHSrcPosCam(Bool_t wobble=kFALSE, const char *name=NULL, const char *title=NULL);
+    MHSrcPosCam(Bool_t wobble=kTRUE, const char *name=NULL, const char *title=NULL);
 
     // MH