diff --git a/examples/make_binned_analysis.py b/examples/make_binned_analysis.py index e33b803..a4de70e 100755 --- a/examples/make_binned_analysis.py +++ b/examples/make_binned_analysis.py @@ -329,7 +329,7 @@ def plot_counts(observations): offset2 = [(i+0.5)*doffset2 for i in range(nx)] counts = [0.0 for i in range(nx)] for bin in cube: - off = GCTAInstDir(bin.dir()).dist_deg(crab) + off = GCTAInstDir(bin.dir()).dir().dist_deg(crab) off2 = off*off index = int(off2/doffset2) if index < nx: @@ -348,7 +348,7 @@ def plot_counts(observations): sys.stdout.write("- "+m.name()+"\n") model = [0.0 for i in range(nx)] for bin in cube: - off = GCTAInstDir(bin.dir()).dist_deg(crab) + off = GCTAInstDir(bin.dir()).dir().dist_deg(crab) off2 = off*off index = int(off2/doffset2) if index < nx: diff --git a/examples/make_unbinned_analysis.py b/examples/make_unbinned_analysis.py index b58cffe..8d26f1e 100755 --- a/examples/make_unbinned_analysis.py +++ b/examples/make_unbinned_analysis.py @@ -314,7 +314,7 @@ def plot_counts(observations): offset2 = [(i+0.5)*doffset2 for i in range(nx)] counts = [0.0 for i in range(nx)] for atom in list: - off = GCTAInstDir(atom.dir()).dist_deg(crab) + off = GCTAInstDir(atom.dir()).dir().dist_deg(crab) off2 = off*off index = int(off2/doffset2) if index < nx: @@ -333,7 +333,7 @@ def plot_counts(observations): print "- "+m.name() model = [0.0 for i in range(nx)] for atom in list: - off = GCTAInstDir(atom.dir()).dist_deg(crab) + off = GCTAInstDir(atom.dir()).dir().dist_deg(crab) off2 = off*off index = int(off2/doffset2) if index < nx: diff --git a/scripts/obsutils.py b/scripts/obsutils.py index 28493e6..719ae0c 100755 --- a/scripts/obsutils.py +++ b/scripts/obsutils.py @@ -182,7 +182,7 @@ def cntmap(obs, proj="TAN", coord="GAL", xval=0.0, yval=0.0, \ # Determine sky pixel skydir = GCTAInstDir(event.dir()).dir() - pixel = map.dir2pix(skydir) + pixel = map.dir2inx(skydir) # Set pixel map[pixel] += 1.0 @@ -234,7 +234,7 @@ def modmap(obs, eref=0.1, proj="TAN", coord="GAL", xval=0.0, yval=0.0, \ for pixel in range(map.npix()): # Get sky direction - skydir = map.pix2dir(pixel) + skydir = map.inx2dir(pixel) instdir.dir(skydir) # Create event atom for map pixel