diff --git a/gbm_drm_gen/drmgen_trig.py b/gbm_drm_gen/drmgen_trig.py index b77817e..a637e84 100644 --- a/gbm_drm_gen/drmgen_trig.py +++ b/gbm_drm_gen/drmgen_trig.py @@ -36,7 +36,6 @@ def __init__( maxen = 140 - # Setup the input side energy edges if det > 11: @@ -48,7 +47,6 @@ def __init__( in_edge = trigdat_edges["nai"] out_edge = trigdat_out_edge["nai"] - try: position_interpolator = gbmgeometry.PositionInterpolator.from_trigdat( trigdat_file=trigdat_file @@ -58,21 +56,19 @@ def __init__( position_interpolator = gbmgeometry.PositionInterpolator.from_trigdat_hdf5( trigdat_file=trigdat_file - ) - + ) - super(DRMGenTrig, self).__init__( - position_interpolator=position_interpolator, - det_number=det_number, - ebin_edge_in=in_edge, - mat_type=matrix_type, - ebin_edge_out=out_edge, - occult=occult, - time = time + super(DRMGenTrig, self).__init__( + position_interpolator=position_interpolator, + det_number=det_number, + ebin_edge_in=in_edge, + mat_type=matrix_type, + ebin_edge_out=out_edge, + occult=occult, + time=time ) - ################ lu = [ "n0", diff --git a/versioneer.py b/versioneer.py index 64fea1c..3aa5da3 100644 --- a/versioneer.py +++ b/versioneer.py @@ -339,9 +339,9 @@ def get_config_from_root(root): # configparser.NoOptionError (if it lacks "VCS="). See the docstring at # the top of versioneer.py for instructions on writing your setup.cfg . setup_cfg = os.path.join(root, "setup.cfg") - parser = configparser.SafeConfigParser() + parser = configparser.ConfigParser() with open(setup_cfg, "r") as f: - parser.readfp(f) + parser.read_file(f) VCS = parser.get("versioneer", "VCS") # mandatory def get(parser, name):