Commit 122d96d3 authored by Alex Codoreanu's avatar Alex Codoreanu
Browse files

Merge branch 'pwc_p3_sm2fits' into 'master'

Upgrade gstlal_postcoh_skymap2fits to Python 3

See merge request lscsoft/spiir!12
parents b8d0c0a8 9e2117bb
......@@ -21,7 +21,7 @@ Produce a fits file from binary sky map file
"""
import struct
from lalinference.io import fits
from ligo.skymap.io import fits
import numpy as np
import scipy as sp
import pdb
......@@ -127,12 +127,12 @@ nifo = len(instruments) / 2 # ifo e.g. H1, L1, len is 2
# read cohsnr^2, and nullsnr^2 for each sky direction
f = open(input_fname, 'rb')
for chunk in iter(lambda: f.read(4), ''):
for chunk in iter(lambda: f.read(4), b''):
allread_skymap.append(struct.unpack('f', chunk)[0])
f.close()
# load cohsnrsq, and nullsnrsq
npix = len(allread_skymap) / 2
npix = int(len(allread_skymap) / 2)
cohsnrsq_skymap = allread_skymap[0:npix]
nullsnrsq_skymap = allread_skymap[npix:]
......@@ -142,11 +142,11 @@ nullsnrsq_skymap = allread_skymap[npix:]
xmldoc = utils.load_filename(opts.cuda_postcoh_detrsp_fname,
contenthandler=DefaultContentHandler,
verbose=opts.verbose)
detrsp_start_time = long(
detrsp_start_time = int(
param_from_xmldoc(xmldoc, pipe_macro.DETRSP_XML_PARAM_NAME_GPS_START))
gps_step = long(
gps_step = int(
param_from_xmldoc(xmldoc, pipe_macro.DETRSP_XML_PARAM_NAME_GPS_STEP))
event_time = long(opts.event_time)
event_time = int(opts.event_time)
igps = find_closest_gps(event_time, detrsp_start_time, gps_step)
Det_name = "Det_map_gps_%d" % igps
Det_array = array_from_xmldoc(xmldoc, Det_name)
......
......@@ -21,13 +21,32 @@ except IndexError:
import pygtk
pygtk.require("2.0")
import gobject
gobject.threads_init()
import pygst
pygst.require('0.10')
import gst
try:
gobject.threads_init()
except AttributeError:
# according to the PyGobject documentation, threads_init isn't needed for
# modern versions, and after a certain point it seems to have been removed.
# So if we get an attribute error, presumably we are using one of those
# later versions and so can just eat it
pass
# This is somewhat unsatisfactory conditional version check. If we're running
# under Python 3, then we won't be able to import pygst (because pygst is for
# gstreamer-0.10, but gstreamer 0.10 does not support Python 3). Then,
# subsequently, we won't be able to import anything below that except for the
# very basics.
# Thankfully, the only thing we actually need for gstlal_postcoh_skymap2fits is
# gstlal.pipemodules.pipe_macro, so we can (for now) gate the other imports
# behind a Python version check
import sys
if sys.version_info[0] == 2:
import pygst
pygst.require('0.10')
import gst
from gstlal import pipeio
from gstlal import pipeparts
from gstlal import pipeio
from gstlal import pipeparts
from gstlal.pipemodules import pipe_macro
#
# SPIIR many instruments, many template banks
......@@ -154,7 +173,7 @@ def mkcohfar_accumbackground(pipeline,
if output_name is not None:
properties["output_name"] = output_name
print "source type %d" % source_type
print("source type %d" % source_type)
if "name" in properties:
elem = gst.element_factory_make("cohfar_accumbackground",
properties.pop("name"))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment