Commit c20f69bc423c361789ec9dde435259caeda1d621
1 parent
e60f80cc
Adapt to GammaLib-00-08-00
Showing
3 changed files
with
6 additions
and
6 deletions
examples/make_binned_analysis.py
| @@ -329,7 +329,7 @@ def plot_counts(observations): | @@ -329,7 +329,7 @@ def plot_counts(observations): | ||
| 329 | offset2 = [(i+0.5)*doffset2 for i in range(nx)] | 329 | offset2 = [(i+0.5)*doffset2 for i in range(nx)] |
| 330 | counts = [0.0 for i in range(nx)] | 330 | counts = [0.0 for i in range(nx)] |
| 331 | for bin in cube: | 331 | for bin in cube: |
| 332 | - off = GCTAInstDir(bin.dir()).dist_deg(crab) | 332 | + off = GCTAInstDir(bin.dir()).dir().dist_deg(crab) |
| 333 | off2 = off*off | 333 | off2 = off*off |
| 334 | index = int(off2/doffset2) | 334 | index = int(off2/doffset2) |
| 335 | if index < nx: | 335 | if index < nx: |
| @@ -348,7 +348,7 @@ def plot_counts(observations): | @@ -348,7 +348,7 @@ def plot_counts(observations): | ||
| 348 | sys.stdout.write("- "+m.name()+"\n") | 348 | sys.stdout.write("- "+m.name()+"\n") |
| 349 | model = [0.0 for i in range(nx)] | 349 | model = [0.0 for i in range(nx)] |
| 350 | for bin in cube: | 350 | for bin in cube: |
| 351 | - off = GCTAInstDir(bin.dir()).dist_deg(crab) | 351 | + off = GCTAInstDir(bin.dir()).dir().dist_deg(crab) |
| 352 | off2 = off*off | 352 | off2 = off*off |
| 353 | index = int(off2/doffset2) | 353 | index = int(off2/doffset2) |
| 354 | if index < nx: | 354 | if index < nx: |
examples/make_unbinned_analysis.py
| @@ -314,7 +314,7 @@ def plot_counts(observations): | @@ -314,7 +314,7 @@ def plot_counts(observations): | ||
| 314 | offset2 = [(i+0.5)*doffset2 for i in range(nx)] | 314 | offset2 = [(i+0.5)*doffset2 for i in range(nx)] |
| 315 | counts = [0.0 for i in range(nx)] | 315 | counts = [0.0 for i in range(nx)] |
| 316 | for atom in list: | 316 | for atom in list: |
| 317 | - off = GCTAInstDir(atom.dir()).dist_deg(crab) | 317 | + off = GCTAInstDir(atom.dir()).dir().dist_deg(crab) |
| 318 | off2 = off*off | 318 | off2 = off*off |
| 319 | index = int(off2/doffset2) | 319 | index = int(off2/doffset2) |
| 320 | if index < nx: | 320 | if index < nx: |
| @@ -333,7 +333,7 @@ def plot_counts(observations): | @@ -333,7 +333,7 @@ def plot_counts(observations): | ||
| 333 | print "- "+m.name() | 333 | print "- "+m.name() |
| 334 | model = [0.0 for i in range(nx)] | 334 | model = [0.0 for i in range(nx)] |
| 335 | for atom in list: | 335 | for atom in list: |
| 336 | - off = GCTAInstDir(atom.dir()).dist_deg(crab) | 336 | + off = GCTAInstDir(atom.dir()).dir().dist_deg(crab) |
| 337 | off2 = off*off | 337 | off2 = off*off |
| 338 | index = int(off2/doffset2) | 338 | index = int(off2/doffset2) |
| 339 | if index < nx: | 339 | if index < nx: |
scripts/obsutils.py
| @@ -182,7 +182,7 @@ def cntmap(obs, proj="TAN", coord="GAL", xval=0.0, yval=0.0, \ | @@ -182,7 +182,7 @@ def cntmap(obs, proj="TAN", coord="GAL", xval=0.0, yval=0.0, \ | ||
| 182 | 182 | ||
| 183 | # Determine sky pixel | 183 | # Determine sky pixel |
| 184 | skydir = GCTAInstDir(event.dir()).dir() | 184 | skydir = GCTAInstDir(event.dir()).dir() |
| 185 | - pixel = map.dir2pix(skydir) | 185 | + pixel = map.dir2inx(skydir) |
| 186 | 186 | ||
| 187 | # Set pixel | 187 | # Set pixel |
| 188 | map[pixel] += 1.0 | 188 | map[pixel] += 1.0 |
| @@ -234,7 +234,7 @@ def modmap(obs, eref=0.1, proj="TAN", coord="GAL", xval=0.0, yval=0.0, \ | @@ -234,7 +234,7 @@ def modmap(obs, eref=0.1, proj="TAN", coord="GAL", xval=0.0, yval=0.0, \ | ||
| 234 | for pixel in range(map.npix()): | 234 | for pixel in range(map.npix()): |
| 235 | 235 | ||
| 236 | # Get sky direction | 236 | # Get sky direction |
| 237 | - skydir = map.pix2dir(pixel) | 237 | + skydir = map.inx2dir(pixel) |
| 238 | instdir.dir(skydir) | 238 | instdir.dir(skydir) |
| 239 | 239 | ||
| 240 | # Create event atom for map pixel | 240 | # Create event atom for map pixel |