Changeset 8383 for trunk

Timestamp:

03/28/07 13:43:28 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mjobs/MJCut.cc (modified) (6 diffs)
• mpointing/MHSrcPosCam.cc (modified) (5 diffs)
• mraw/MRawRunHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/03/28 Thomas Bretz
+
+   * mraw/MRawRunHeader.cc:
+     - added Getter for fFreqSampling
+
+
+
  2007/03/21 Stefan Ruegamer
 
    * datacenter/scripts/runcallisto:
      - removed entries for callisto_MarApr05.rc (outdated)
-     
+
    * datacenter/scripts/makecallistolinks:
      - updated reason1 because the old reason has been removed in the
@@ -35 +42 @@
 
    * datacenter/db/db.php, datacenter/scripts/budb,
-     datacenter/scripts/dbchk, /datacenter/scripts/dunotseqruns,
-     /datacenter/scripts/findnewstars,
-     /datacenter/scripts/findnotseqruns, /datacenter/scripts/sourcefile,
-     /datacenter/tools/comparesequences, datacenter/tools/resetdataset,
+     datacenter/scripts/dbchk, datacenter/scripts/dunotseqruns,
+     datacenter/scripts/findnewstars,
+     datacenter/scripts/findnotseqruns, datacenter/scripts/sourcefile,
+     datacenter/tools/comparesequences, datacenter/tools/resetdataset,
      sql.rc:
      - changed the host from hercules to vela

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -55 +55 @@
 #include "MTaskEnv.h"
 #include "MPointingDevCalc.h"
+#include "MParameterCalc.h"
 #include "MSrcPosRndm.h"
 #include "MSrcPosCalc.h"
@@ -375 +376 @@
     write->AddContainer("MMcEvt",         "Events", kFALSE);
     write->AddContainer("DataType",       "Events");
+    write->AddContainer("RunNumber",      "Events");
+    write->AddContainer("EvtNumber",      "Events");
     //    write->AddContainer("MMuonSearchPar", "Events", kFALSE);
     //    write->AddContainer("MMuonCalibPar",  "Events", kFALSE);
@@ -549 +552 @@
     MParList plist;
 
-    MHSrcPosCam hsrcpos;
+    MHSrcPosCam hsrcpos(fIsWobble);
     if (!fIsWobble && source.IsInitialized() && fRndmSrcPos)
     {
@@ -662 +665 @@
     taskenv3.SetDefault(fCalcDisp);
 
+    MParameterCalc setevtnum("MRawEvtHeader.fDAQEvtNumber", "SetEvtNumber");
+    setevtnum.SetNameParameter("EvtNumber");
+
+    MParameterCalc setrunnum("MRawRunHeader.fRunNumber", "SetRunNumber");
+    setrunnum.SetNameParameter("RunNumber");
+
     //    MFillH fill0a("OnPos [MHSrcPosCam]", "MSrcPosCam", "FillSrcPosCam");
     MFillH fill1a("MHHillasOffPre  [MHHillas]",      "MHillas",      "FillHillasPre");
@@ -714 +723 @@
     tlist2.AddToList(&taskenv2);
     tlist2.AddToList(&taskenv3);
+    tlist2.AddToList(&setrunnum);
+    tlist2.AddToList(&setevtnum);
     if (write0)
         tlist2.AddToList(write0);
@@ -895 +906 @@
         tlist2.RemoveFromList(&srcrndm);
     }
+
+    MFillH fillsrc(&hsrcpos, "MSrcPosCam", "FillSrcPosCam");
+    fillsrc.SetNameTab("SrcPos");
+    if (fIsWobble)
+        tlist2.AddToListBefore(&fillsrc, &hcalc);
+
     if (!fWriteOnly)
     {

trunk/MagicSoft/Mars/mpointing/MHSrcPosCam.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 2/2006 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2006
+!   Copyright: MAGIC Software Development, 2007
 !
 !
@@ -34 +34 @@
 
 #include <TCanvas.h>
+#include <TEllipse.h>
 
 #include "MGeomCam.h"
@@ -55 +56 @@
 // Default Constructor
 //
-MHSrcPosCam::MHSrcPosCam(const char *name, const char *title)
+MHSrcPosCam::MHSrcPosCam(Bool_t wobble, const char *name, const char *title)
     : fTimeEffOn(NULL), fEffOnTime(NULL), fSourcePos(NULL)
 {
@@ -75 +76 @@
     fHist.SetContour(99);
 
+    const Float_t x = wobble ? 0.5499 : 0.2499;
+    const Int_t   n = wobble ? 101    : 51;
 
     MBinning bins;
-    bins.SetEdges(51, -0.2499, 0.2499); // bin=0.01ø  ~0.5SE
+    bins.SetEdges(n, -x, x); // bin=0.01ø  ~0.5SE
 
     MH::SetBinning(&fHist, &bins, &bins);
@@ -184 +187 @@
     gPad->SetGridy();
 
+    AppendPad();
+
     fHist.Draw("colz");
 
-    AppendPad();
-}
-
+    if (fHist.GetXaxis()->GetXmax()>0.5)
+    {
+        TEllipse el;
+        el.SetFillStyle(4000);
+        el.SetLineColor(kMagenta);
+        el.DrawEllipse(0, 0, 0.4, 0, 0, 360, 0);
+    }
+}
+

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -106 +106 @@
     UShort_t GetNumBytesPerSample() const { return fNumBytesPerSample; }
     UInt_t   GetNumEvents() const         { return fNumEvents; }
+    UShort_t GetFreqSampling() const      { return fFreqSampling; }
     const MTime &GetRunStart() const      { return fRunStart; }
     const MTime &GetRunEnd() const        { return fRunStop; }