Changeset 18282 for branches/MarsGapdTimeJitter/mimage

Timestamp:

08/18/15 10:28:44 (9 years ago)

Author:

Jens Buss

Message:

merged Trunk into Branch

Location:

branches/MarsGapdTimeJitter

Files:

• . (modified) (1 prop)
• mimage/MNewImagePar.cc (modified) (1 diff)

branches/MarsGapdTimeJitter/mimage/MNewImagePar.cc

@@ -220 +220 @@
         const Double_t dzx   =  hillas.GetCosDelta()*dx + hillas.GetSinDelta()*dy; // [mm]
         const Double_t dzy   = -hillas.GetSinDelta()*dx + hillas.GetCosDelta()*dy; // [mm]
-        const Double_t dz    =  gpix.GetT()*gpix.GetT()/4;
-        const Double_t tana  =  dzy*dzy/(dzx*dzx);
-        const Double_t distr =  (1+tana)/(rl + tana*rw);
-        if (distr>dist0-dz || dzx==0)
+        const Double_t dz    =  gpix.GetT()/2;
+        const Double_t distr =  (dzy*dzy+dzx*dzx)/(dzx*dzx*rl + dzy*dzy*rw);
+        if ((dzx==0 && dzy==0) || sqrt(distr)>sqrt(dist0)-dz)
             fConcCore += nphot;