Changeset 9615 for trunk/MagicSoft

Timestamp:

07/09/10 15:19:10 (14 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mimage/MImgCleanStd.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2010/07/09 Thomas Bretz
+
+   * mpointing/MSrcPosCam.[h,cc]:
+     - now the particle position is stored in any case in the headers
+       so in case we have a view cone we must keep the position fixed
+     - added the fix for the MC monte carlos (for them X needs to
+       change its sign due to a bug in the reflector program)
+
+   * mars.rc, star.rc:
+     - changed time contraint in cleaning from aboslute values
+       to relative values (units now ns/deg)
+
+   * mimage/MImgCleanStd.cc:
+     - changed time contraint in cleaning from aboslute values
+       to relative values (units now ns/deg)
+
+
+
  2010/07/07 Daniela Dorner
 

trunk/MagicSoft/Mars/NEWS

@@ -38 +38 @@
      has been implemented to set an artificial run-number:
         ---run-number=12345
+
+ ;star:
+
+   * The time constraint in the image cleaning is now scaled with the
+     pixel distance. Consequently, the value given is not absolute in
+     ns anymore, but in ns/deg. This means that the values for MAGIC
+     have to be scaled by a factor of 10.
 
 

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -664 +664 @@
     MArrayI indices;
 
+    // Add conversion factor for dx here
+    const Double_t dtmax = lvl*fCam->GetConvMm2Deg();
+
     const UInt_t npixevt = fEvt->GetNumPixels();
     for (UInt_t idx=0; idx<npixevt; idx++)
@@ -689 +692 @@
                 continue;
 
+            const Double_t dt = TMath::Abs(npix.GetArrivalTime()-tm0);
+            const Double_t dx = gpix.GetDist((*fCam)[idx2]);
+
             // If this pixel is to far away (in arrival time) don't count
-            if (TMath::Abs(npix.GetArrivalTime()-tm0)>lvl)
+            if (dt>dtmax*dx)
                 continue;