Commit 0a35a784 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Fix default definition of make_3d flag

parent 0f2f320c

src/scripts/model_maker.py

+1 −2
Original line number Original line Diff line number Diff line
@@ -147,7 +147,7 @@ def load_model(model_file): 
        max_rad = 0.0

        max_rad = 0.0

        make_3d = False

        make_3d = False

        try:

        try:

            if model['system_settings']['make_3D'] == "0" else True

            make_3d = False if model['system_settings']['make_3D'] == "0" else True

        except KeyError:

        except KeyError:

            make_3d = False

            make_3d = False

        if (make_3d and not allow_3d):

        if (make_3d and not allow_3d):
@@ -403,7 +403,6 @@ def load_model(model_file): 
                    gconf['vec_sph_x'][si] = float(model['geometry_settings']['x_coords'][si])

                    gconf['vec_sph_x'][si] = float(model['geometry_settings']['x_coords'][si])

                    gconf['vec_sph_y'][si] = float(model['geometry_settings']['y_coords'][si])

                    gconf['vec_sph_y'][si] = float(model['geometry_settings']['y_coords'][si])

                    gconf['vec_sph_z'][si] = float(model['geometry_settings']['z_coords'][si])

                    gconf['vec_sph_z'][si] = float(model['geometry_settings']['z_coords'][si])

        #

        if (model['system_settings']['make_3D'] != "0" and allow_3d):

        if (model['system_settings']['make_3D'] != "0" and allow_3d):

            if (max_rad == 0.0):

            if (max_rad == 0.0):

                max_rad = 20.0 * max(sconf['ros'])

                max_rad = 20.0 * max(sconf['ros'])