Merge branch 'develop' into 'master'

merge develop into master (for release v2.0)

See merge request csst_sim/csst-simulation!13

ObservationSim/Instrument/data/ccd/chip_definition.json

+{
+    "31": {
+        "chip_name": "FGS1A-D1",
+        "pix_size": 0.0075,
+        "pix_scale": 0.0555,
+        "npix_x": 11264,
+        "npix_y": 7680,
+        "x_cen": -325.395,
+        "y_cen": -47.82,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300.0,
+        "falt_exptime": 150.0,
+        "readout_time": 0.01,
+        "df_strength": 2.3,
+        "bias_level": 2000.0,
+        "gain": 1.0,
+        "full_well": 90000
+    },
+    "32": {
+        "chip_name": "FGS1A-D2",
+        "pix_size": 0.0075,
+        "pix_scale": 0.0555,
+        "npix_x": 11264,
+        "npix_y": 7680,
+        "x_cen": -325.395,
+        "y_cen": 22.7,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300.0,
+        "falt_exptime": 150.0,
+        "readout_time": 0.01,
+        "df_strength": 2.3,
+        "bias_level": 2000.0,
+        "gain": 1.0,
+        "full_well": 90000
+    },
+    "33": {
+        "chip_name": "FGS1B-D1",
+        "pix_size": 0.0075,
+        "pix_scale": 0.0555,
+        "npix_x": 11264,
+        "npix_y": 7680,
+        "x_cen": -325.395,
+        "y_cen": 93.195,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300.0,
+        "falt_exptime": 150.0,
+        "readout_time": 0.01,
+        "df_strength": 2.3,
+        "bias_level": 2000.0,
+        "gain": 1.0,
+        "full_well": 90000
+    },
+    "34": {
+        "chip_name": "FGS1B-D2",
+        "pix_size": 0.0075,
+        "pix_scale": 0.0555,
+        "npix_x": 11264,
+        "npix_y": 7680,
+        "x_cen": -325.395,
+        "y_cen": 163.69,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300.0,
+        "falt_exptime": 150.0,
+        "readout_time": 0.01,
+        "df_strength": 2.3,
+        "bias_level": 2000.0,
+        "gain": 1.0,
+        "full_well": 90000
+    },
+    "35": {
+        "chip_name": "FGS2A-D1",
+        "pix_size": 0.0075,
+        "pix_scale": 0.0555,
+        "npix_x": 11264,
+        "npix_y": 7680,
+        "x_cen": 325.395,
+        "y_cen": 47.82,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300.0,
+        "falt_exptime": 150.0,
+        "readout_time": 0.01,
+        "df_strength": 2.3,
+        "bias_level": 2000.0,
+        "gain": 1.0,
+        "full_well": 90000
+    },
+    "36": {
+        "chip_name": "FGS2A-D2",
+        "pix_size": 0.0075,
+        "pix_scale": 0.0555,
+        "npix_x": 11264,
+        "npix_y": 7680,
+        "x_cen": 325.395,
+        "y_cen": -22.7,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300.0,
+        "falt_exptime": 150.0,
+        "readout_time": 0.01,
+        "df_strength": 2.3,
+        "bias_level": 2000.0,
+        "gain": 1.0,
+        "full_well": 90000
+    },
+    "37": {
+        "chip_name": "FGS2B-D1",
+        "pix_size": 0.0075,
+        "pix_scale": 0.0555,
+        "npix_x": 11264,
+        "npix_y": 7680,
+        "x_cen": 325.395,
+        "y_cen": -93.195,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300.0,
+        "falt_exptime": 150.0,
+        "readout_time": 0.01,
+        "df_strength": 2.3,
+        "bias_level": 2000.0,
+        "gain": 1.0,
+        "full_well": 90000
+    },
+    "38": {
+        "chip_name": "FGS2B-D2",
+        "pix_size": 0.0075,
+        "pix_scale": 0.0555,
+        "npix_x": 11264,
+        "npix_y": 7680,
+        "x_cen": 325.395,
+        "y_cen": -163.69,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300.0,
+        "falt_exptime": 150.0,
+        "readout_time": 0.01,
+        "df_strength": 2.3,
+        "bias_level": 2000.0,
+        "gain": 1.0,
+        "full_well": 90000
+    },
+    "39": {
+        "chip_name": "FGS3-D1",
+        "pix_size": 0.0075,
+        "pix_scale": 0.0555,
+        "npix_x": 11264,
+        "npix_y": 7680,
+        "x_cen": -273.35,
+        "y_cen": 211.36,
+        "rotate_angle": 90.0,
+        "n_psf_samples": 100,
+        "dark_exptime": 300.0,
+        "falt_exptime": 150.0,
+        "readout_time": 0.01,
+        "df_strength": 2.3,
+        "bias_level": 2000.0,
+        "gain": 1.0,
+        "full_well": 90000
+    },
+    "40": {
+        "chip_name": "FGS3-D2",
+        "pix_size": 0.0075,
+        "pix_scale": 0.0555,
+        "npix_x": 11264,
+        "npix_y": 7680,
+        "x_cen": -202.805,
+        "y_cen": 211.36,
+        "rotate_angle": 90.0,
+        "n_psf_samples": 100,
+        "dark_exptime": 300.0,
+        "falt_exptime": 150.0,
+        "readout_time": 0.01,
+        "df_strength": 2.3,
+        "bias_level": 2000.0,
+        "gain": 1.0,
+        "full_well": 90000
+    },
+    "41": {
+        "chip_name": "FGS4-D1",
+        "pix_size": 0.0075,
+        "pix_scale": 0.0555,
+        "npix_x": 11264,
+        "npix_y": 7680,
+        "x_cen": 151.03,
+        "y_cen": -233.885,
+        "rotate_angle": 90.0,
+        "n_psf_samples": 100,
+        "dark_exptime": 300.0,
+        "falt_exptime": 150.0,
+        "readout_time": 0.01,
+        "df_strength": 2.3,
+        "bias_level": 2000.0,
+        "gain": 1.0,
+        "full_well": 90000
+    },
+    "42": {
+        "chip_name": "FGS4-D2",
+        "pix_size": 0.0075,
+        "pix_scale": 0.0555,
+        "npix_x": 11264,
+        "npix_y": 7680,
+        "x_cen": 80.51,
+        "y_cen": -233.885,
+        "rotate_angle": 90.0,
+        "n_psf_samples": 100,
+        "dark_exptime": 300.0,
+        "falt_exptime": 150.0,
+        "readout_time": 0.01,
+        "df_strength": 2.3,
+        "bias_level": 2000.0,
+        "gain": 1.0,
+        "full_well": 90000
+    },
+    "1": {
+        "chip_name": "GI-1",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 251.5,
+        "y_cen": -202.6,
+        "rotate_angle": -1.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "2": {
+        "chip_name": "GV-1",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 251.5,
+        "y_cen": -101.3,
+        "rotate_angle": -1.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "3": {
+        "chip_name": "GU-1",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 251.5,
+        "y_cen": 0.0,
+        "rotate_angle": -1.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "4": {
+        "chip_name": "GU-2",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 251.5,
+        "y_cen": 101.3,
+        "rotate_angle": -1.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "5": {
+        "chip_name": "GV-2",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 251.5,
+        "y_cen": 202.6,
+        "rotate_angle": -1.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "6": {
+        "chip_name": "y-1",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 146.25,
+        "y_cen": -202.6,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "7": {
+        "chip_name": "i-1",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 146.25,
+        "y_cen": -101.3,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "8": {
+        "chip_name": "g-1",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 146.25,
+        "y_cen": 0.0,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "9": {
+        "chip_name": "r-1",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 146.25,
+        "y_cen": 101.3,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "10": {
+        "chip_name": "GI-2",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 154.0,
+        "y_cen": 202.6,
+        "rotate_angle": -1.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "11": {
+        "chip_name": "z-1",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 48.75,
+        "y_cen": -202.6,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "12": {
+        "chip_name": "NUV-1",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 48.75,
+        "y_cen": -101.3,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "13": {
+        "chip_name": "NUV-2",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 48.75,
+        "y_cen": 0.0,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "14": {
+        "chip_name": "u-1",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 48.75,
+        "y_cen": 101.3,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "15": {
+        "chip_name": "y-4",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": 48.75,
+        "y_cen": 202.6,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "16": {
+        "chip_name": "y-3",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -48.75,
+        "y_cen": -202.6,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "17": {
+        "chip_name": "u-2",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -48.75,
+        "y_cen": -101.3,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "18": {
+        "chip_name": "NUV-3",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -48.75,
+        "y_cen": 0.0,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "19": {
+        "chip_name": "NUV-4",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -48.75,
+        "y_cen": 101.3,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "20": {
+        "chip_name": "z-2",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -48.75,
+        "y_cen": 202.6,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "21": {
+        "chip_name": "GI-3",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -154.0,
+        "y_cen": -202.6,
+        "rotate_angle": 1.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "22": {
+        "chip_name": "r-2",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -146.25,
+        "y_cen": -101.3,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "23": {
+        "chip_name": "g-2",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -146.25,
+        "y_cen": 0.0,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "24": {
+        "chip_name": "i-2",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -146.25,
+        "y_cen": 101.3,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "25": {
+        "chip_name": "y-2",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -146.25,
+        "y_cen": 202.6,
+        "rotate_angle": 0.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "26": {
+        "chip_name": "GV-3",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -251.5,
+        "y_cen": -202.6,
+        "rotate_angle": 1.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "27": {
+        "chip_name": "GU-3",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -251.5,
+        "y_cen": -101.3,
+        "rotate_angle": 1.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "28": {
+        "chip_name": "GU-4",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -251.5,
+        "y_cen": 0.0,
+        "rotate_angle": 1.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "29": {
+        "chip_name": "GV-4",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -251.5,
+        "y_cen": 101.3,
+        "rotate_angle": 1.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    },
+    "30": {
+        "chip_name": "GI-4",
+        "pix_size": 0.01,
+        "pix_scale": 0.074,
+        "npix_x": 9216,
+        "npix_y": 9232,
+        "x_cen": -251.5,
+        "y_cen": 202.6,
+        "rotate_angle": 1.0,
+        "n_psf_samples": 900,
+        "dark_exptime": 300,
+        "flat_exptime": 150,
+        "readout_time": 40,
+        "df_strength": 2.3,
+        "bias_level": 500,
+        "gain": 1.1,
+        "full_well": 90000
+    }
+}
\ No newline at end of file

ObservationSim/Instrument/data/filters/fgs_sub.list

+3000
+4500
+4750
+5000
+6000
+6500
+7500
+8500
+11000
\ No newline at end of file

ObservationSim/Instrument/data/throughputs/fgs_throughput.txt

+# fgs_cssc
+# lambda_Angst  throughput
+ 2000.00    0.00000
+ 2010.00    0.00000
+ 2020.00    0.00000
+ 2030.00    0.00000
+ 2040.00    0.00000
+ 2050.00    0.00000
+ 2060.00    0.00000
+ 2070.00    0.00000
+ 2080.00    0.00000
+ 2090.00    0.00000
+ 2100.00    0.00000
+ 2110.00    0.00000
+ 2120.00    0.00000
+ 2130.00    0.00000
+ 2140.00    0.00000
+ 2150.00    0.00001
+ 2160.00    0.00001
+ 2170.00    0.00001
+ 2180.00    0.00001
+ 2190.00    0.00001
+ 2200.00    0.00001
+ 2210.00    0.00001
+ 2220.00    0.00002
+ 2230.00    0.00002
+ 2240.00    0.00002
+ 2250.00    0.00002
+ 2260.00    0.00003
+ 2270.00    0.00003
+ 2280.00    0.00003
+ 2290.00    0.00004
+ 2300.00    0.00004
+ 2310.00    0.00005
+ 2320.00    0.00005
+ 2330.00    0.00006
+ 2340.00    0.00006
+ 2350.00    0.00007
+ 2360.00    0.00007
+ 2370.00    0.00008
+ 2380.00    0.00008
+ 2390.00    0.00009
+ 2400.00    0.00010
+ 2410.00    0.00011
+ 2420.00    0.00011
+ 2430.00    0.00012
+ 2440.00    0.00013
+ 2450.00    0.00014
+ 2460.00    0.00015
+ 2470.00    0.00016
+ 2480.00    0.00017
+ 2490.00    0.00018
+ 2500.00    0.00019
+ 2510.00    0.00019
+ 2520.00    0.00020
+ 2530.00    0.00021
+ 2540.00    0.00022
+ 2550.00    0.00023
+ 2560.00    0.00023
+ 2570.00    0.00022
+ 2580.00    0.00022
+ 2590.00    0.00021
+ 2600.00    0.00021
+ 2610.00    0.00021
+ 2620.00    0.00021
+ 2630.00    0.00021
+ 2640.00    0.00020
+ 2650.00    0.00020
+ 2660.00    0.00019
+ 2670.00    0.00018
+ 2680.00    0.00017
+ 2690.00    0.00017
+ 2700.00    0.00017
+ 2710.00    0.00016
+ 2720.00    0.00016
+ 2730.00    0.00016
+ 2740.00    0.00015
+ 2750.00    0.00015
+ 2760.00    0.00015
+ 2770.00    0.00016
+ 2780.00    0.00016
+ 2790.00    0.00017
+ 2800.00    0.00017
+ 2810.00    0.00018
+ 2820.00    0.00019
+ 2830.00    0.00019
+ 2840.00    0.00019
+ 2850.00    0.00020
+ 2860.00    0.00020
+ 2870.00    0.00021
+ 2880.00    0.00021
+ 2890.00    0.00022
+ 2900.00    0.00022
+ 2910.00    0.00023
+ 2920.00    0.00023
+ 2930.00    0.00023
+ 2940.00    0.00023
+ 2950.00    0.00023
+ 2960.00    0.00022
+ 2970.00    0.00022
+ 2980.00    0.00022
+ 2990.00    0.00023
+3.000000000000000000e+03 6.330812045813337396e-02
+3.020000000000000000e+03 7.670753732263933811e-02
+3.040000000000000000e+03 9.457913538725945535e-02
+3.060000000000000000e+03 1.105372967685317592e-01
+3.080000000000000000e+03 1.215876025117385434e-01
+3.100000000000000000e+03 1.389672390312199912e-01
+3.120000000000000000e+03 1.548650104743574119e-01
+3.140000000000000000e+03 1.640442971960397456e-01
+3.160000000000000000e+03 1.741930486442928860e-01
+3.180000000000000000e+03 1.961257608548894471e-01
+3.200000000000000000e+03 2.126123985149099282e-01
+3.220000000000000000e+03 2.240846159413707739e-01
+3.240000000000000000e+03 2.341222206386793514e-01
+3.260000000000000000e+03 2.473473146680077173e-01
+3.280000000000000000e+03 2.745360934284346577e-01
+3.300000000000000000e+03 3.183086156598757266e-01
+3.320000000000000000e+03 3.490051635873731573e-01
+3.340000000000000000e+03 3.584389645493231136e-01
+3.360000000000000000e+03 3.670722141894850465e-01
+3.380000000000000000e+03 3.848601057255426339e-01
+3.400000000000000000e+03 3.930832812193503223e-01
+3.420000000000000000e+03 3.959170003201946675e-01
+3.440000000000000000e+03 3.869439373769253399e-01
+3.460000000000000000e+03 3.800336768323384629e-01
+3.480000000000000000e+03 3.913153410850532254e-01
+3.500000000000000000e+03 3.911448284461088165e-01
+3.520000000000000000e+03 3.821299767417433713e-01
+3.540000000000000000e+03 3.649787404087624365e-01
+3.560000000000000000e+03 3.510985641831776416e-01
+3.580000000000000000e+03 3.335438354240993220e-01
+3.600000000000000000e+03 3.247943385500417501e-01
+3.620000000000000000e+03 3.229360094194214104e-01
+3.640000000000000000e+03 3.150634301845712248e-01
+3.660000000000000000e+03 3.113848380582427411e-01
+3.680000000000000000e+03 3.122022537429203770e-01
+3.700000000000000000e+03 3.116217669176988836e-01
+3.720000000000000000e+03 3.048772307120263259e-01
+3.740000000000000000e+03 3.037785583961263858e-01
+3.760000000000000000e+03 3.154303356914772705e-01
+3.780000000000000000e+03 3.255325925687380662e-01
+3.800000000000000000e+03 3.264902551728756652e-01
+3.820000000000000000e+03 3.307967579681854731e-01
+3.840000000000000000e+03 3.441822280754525121e-01
+3.860000000000000000e+03 3.562799265950001848e-01
+3.880000000000000000e+03 3.698810755509576720e-01
+3.900000000000000000e+03 3.831557928385191936e-01
+3.920000000000000000e+03 3.906082419359617197e-01
+3.940000000000000000e+03 3.971628421019942068e-01
+3.960000000000000000e+03 4.092462479862696845e-01
+3.980000000000000000e+03 4.197953207663929209e-01
+4.000000000000000000e+03 4.283314763335623332e-01
+4.020000000000000000e+03 4.385490684074989098e-01
+4.040000000000000000e+03 4.508391884655688631e-01
+4.060000000000000000e+03 4.645617832389959956e-01
+4.080000000000000000e+03 4.808966283632188365e-01
+4.100000000000000000e+03 4.969737082794632999e-01
+4.120000000000000000e+03 5.103332043888777481e-01
+4.140000000000000000e+03 5.276038587486608922e-01
+4.160000000000000000e+03 5.473026924613549893e-01
+4.180000000000000000e+03 5.652568378983251485e-01
+4.200000000000000000e+03 5.806005651337102780e-01
+4.220000000000000000e+03 5.903466706846162149e-01
+4.240000000000000000e+03 6.013259161859484392e-01
+4.260000000000000000e+03 6.116676934616835926e-01
+4.280000000000000000e+03 6.230723546471242935e-01
+4.300000000000000000e+03 6.337683557884759011e-01
+4.320000000000000000e+03 6.418998404044518047e-01
+4.340000000000000000e+03 6.498941060820193627e-01
+4.360000000000000000e+03 6.532370766962771746e-01
+4.380000000000000000e+03 6.584168605572161548e-01
+4.400000000000000000e+03 6.623832077987570344e-01
+4.420000000000000000e+03 6.637032492759566971e-01
+4.440000000000000000e+03 6.625928763230863883e-01
+4.460000000000000000e+03 6.550664013283420406e-01
+4.480000000000000000e+03 6.458614738891323981e-01
+4.500000000000000000e+03 6.355518019916817085e-01
+4.520000000000000000e+03 6.219272586521428225e-01
+4.540000000000000000e+03 6.080489229191166078e-01
+4.560000000000000000e+03 5.943746991424413428e-01
+4.580000000000000000e+03 5.842844039273258350e-01
+4.600000000000000000e+03 5.753944892073880046e-01
+4.620000000000000000e+03 5.671720542032158141e-01
+4.640000000000000000e+03 5.642419538720495620e-01
+4.660000000000000000e+03 5.615862886193648817e-01
+4.680000000000000000e+03 5.569096633489849513e-01
+4.700000000000000000e+03 5.561119196612702709e-01
+4.720000000000000000e+03 5.575673732184446285e-01
+4.740000000000000000e+03 5.591322084872266673e-01
+4.760000000000000000e+03 5.697554334390410036e-01
+4.780000000000000000e+03 5.683525396406713392e-01
+4.800000000000000000e+03 5.696960107745417945e-01
+4.820000000000000000e+03 5.800592351147152437e-01
+4.840000000000000000e+03 5.872527835376745164e-01
+4.860000000000000000e+03 5.946846974239301531e-01
+4.880000000000000000e+03 6.030204096264187852e-01
+4.900000000000000000e+03 6.138975750423433242e-01
+4.920000000000000000e+03 6.247826287419537827e-01
+4.940000000000000000e+03 6.333104087704682916e-01
+4.960000000000000000e+03 6.408367374674480699e-01
+4.980000000000000000e+03 6.459501416982532662e-01
+5.000000000000000000e+03 6.516698291495482964e-01
+5.020000000000000000e+03 6.518080308202535145e-01
+5.040000000000000000e+03 6.532712923346204459e-01
+5.060000000000000000e+03 6.538447970502083706e-01
+5.080000000000000000e+03 6.496735216634323962e-01
+5.100000000000000000e+03 6.436688719354790589e-01
+5.120000000000000000e+03 6.377366259982214514e-01
+5.140000000000000000e+03 6.323700953191770946e-01
+5.160000000000000000e+03 6.300503567451554154e-01
+5.180000000000000000e+03 6.301189034891401253e-01
+5.200000000000000000e+03 6.283446118520072954e-01
+5.220000000000000000e+03 6.266360532956244400e-01
+5.240000000000000000e+03 6.232276058151379194e-01
+5.260000000000000000e+03 6.244308022322327956e-01
+5.280000000000000000e+03 6.248724307930481059e-01
+5.300000000000000000e+03 6.258149046943198845e-01
+5.320000000000000000e+03 6.250463130955835611e-01
+5.340000000000000000e+03 6.223741452974395072e-01
+5.360000000000000000e+03 6.212597845964885623e-01
+5.380000000000000000e+03 6.209861969073811050e-01
+5.400000000000000000e+03 6.177958767393054718e-01
+5.420000000000000000e+03 6.132338416418634530e-01
+5.440000000000000000e+03 6.083217679188620552e-01
+5.460000000000000000e+03 6.012603597017081025e-01
+5.480000000000000000e+03 5.940061547963575439e-01
+5.500000000000000000e+03 5.841448702792774172e-01
+5.520000000000000000e+03 5.756456145431929627e-01
+5.540000000000000000e+03 5.648028604329227154e-01
+5.560000000000000000e+03 5.549481672930591802e-01
+5.580000000000000000e+03 5.504339608010132556e-01
+5.600000000000000000e+03 5.435111143109307985e-01
+5.620000000000000000e+03 5.357476709746004095e-01
+5.640000000000000000e+03 5.320148855071296090e-01
+5.660000000000000000e+03 5.305971987546633795e-01
+5.680000000000000000e+03 5.299307527523110517e-01
+5.700000000000000000e+03 5.346642314745955193e-01
+5.720000000000000000e+03 5.430049747935866700e-01
+5.740000000000000000e+03 5.558472631010458187e-01
+5.760000000000000000e+03 5.669705280463437358e-01
+5.780000000000000000e+03 5.776084154271731164e-01
+5.800000000000000000e+03 5.846068867977080030e-01
+5.820000000000000000e+03 5.841426001125640255e-01
+5.840000000000000000e+03 5.836784599053755906e-01
+5.860000000000000000e+03 5.804189712888555563e-01
+5.880000000000000000e+03 5.756940009671260849e-01
+5.900000000000000000e+03 5.693182480810373702e-01
+5.920000000000000000e+03 5.611052256713775499e-01
+5.940000000000000000e+03 5.523048765312131847e-01
+5.960000000000000000e+03 5.437306577323383072e-01
+5.980000000000000000e+03 5.376371945410282072e-01
+6.000000000000000000e+03 5.339523585903820369e-01
+6.020000000000000000e+03 5.310235535682374941e-01
+6.040000000000000000e+03 5.293611314324186967e-01
+6.060000000000000000e+03 5.256837343916562766e-01
+6.080000000000000000e+03 5.231569040388276415e-01
+6.100000000000000000e+03 5.191150751161285326e-01
+6.120000000000000000e+03 5.153621981380848149e-01
+6.140000000000000000e+03 5.128734859390938761e-01
+6.160000000000000000e+03 5.084410244339570006e-01
+6.180000000000000000e+03 5.048611772358244654e-01
+6.200000000000000000e+03 5.006861472431808346e-01
+6.220000000000000000e+03 4.960558780734578010e-01
+6.240000000000000000e+03 4.900570417343015350e-01
+6.260000000000000000e+03 4.830150485163599017e-01
+6.280000000000000000e+03 4.770585338663891894e-01
+6.300000000000000000e+03 4.714641482003744111e-01
+6.320000000000000000e+03 4.638887736233234804e-01
+6.340000000000000000e+03 4.566966192255730306e-01
+6.360000000000000000e+03 4.506189218033286314e-01
+6.380000000000000000e+03 4.460796083285573643e-01
+6.400000000000000000e+03 4.384459460600405589e-01
+6.420000000000000000e+03 4.331915864885545475e-01
+6.440000000000000000e+03 4.279303987220463013e-01
+6.460000000000000000e+03 4.227449336119846746e-01
+6.480000000000000000e+03 4.204051336069846712e-01
+6.500000000000000000e+03 4.150341880711640452e-01
+6.520000000000000000e+03 4.108533980246649731e-01
+6.540000000000000000e+03 4.064237858210493770e-01
+6.560000000000000000e+03 4.009942600174490335e-01
+6.580000000000000000e+03 3.969206078670676208e-01
+6.600000000000000000e+03 3.921941041785945159e-01
+6.620000000000000000e+03 3.901572913901848461e-01
+6.640000000000000000e+03 3.838818332277898482e-01
+6.660000000000000000e+03 3.810472472273133127e-01
+6.680000000000000000e+03 3.776929839247752940e-01
+6.700000000000000000e+03 3.736463752561881568e-01
+6.720000000000000000e+03 3.695741552685452569e-01
+6.740000000000000000e+03 3.645821012155553986e-01
+6.760000000000000000e+03 3.592049937500626511e-01
+6.780000000000000000e+03 3.529097185814455973e-01
+6.800000000000000000e+03 3.450700831901369892e-01
+6.820000000000000000e+03 3.369151616324637111e-01
+6.840000000000000000e+03 3.281033029595681882e-01
+6.860000000000000000e+03 3.185352705634660886e-01
+6.880000000000000000e+03 3.100990766653634045e-01
+6.900000000000000000e+03 3.027636582135314613e-01
+6.920000000000000000e+03 2.986803434058665774e-01
+6.940000000000000000e+03 2.973311905406896272e-01
+6.960000000000000000e+03 2.951659284284126605e-01
+6.980000000000000000e+03 2.963826489307986312e-01
+7.000000000000000000e+03 2.961879034028243596e-01
+7.020000000000000000e+03 2.969209343829541936e-01
+7.040000000000000000e+03 2.971311859308420344e-01
+7.060000000000000000e+03 2.971074025707563515e-01
+7.080000000000000000e+03 2.989979227303383724e-01
+7.100000000000000000e+03 2.997423693977802617e-01
+7.120000000000000000e+03 3.012606277644150343e-01
+7.140000000000000000e+03 3.046461180094032772e-01
+7.160000000000000000e+03 3.050279658318308940e-01
+7.180000000000000000e+03 3.084475199188941308e-01
+7.200000000000000000e+03 3.102379542923985878e-01
+7.220000000000000000e+03 3.134101659412124596e-01
+7.240000000000000000e+03 3.151539334892823896e-01
+7.260000000000000000e+03 3.175207509574417553e-01
+7.280000000000000000e+03 3.187048622233846218e-01
+7.300000000000000000e+03 3.188527701469067166e-01
+7.320000000000000000e+03 3.219798323513023419e-01
+7.340000000000000000e+03 3.234702314235740062e-01
+7.360000000000000000e+03 3.229390842565718067e-01
+7.380000000000000000e+03 3.254616904399315058e-01
+7.400000000000000000e+03 3.287265528015929639e-01
+7.420000000000000000e+03 3.284602333599662694e-01
+7.440000000000000000e+03 3.302148782338085731e-01
+7.460000000000000000e+03 3.308622008749660393e-01
+7.480000000000000000e+03 3.332497780337516646e-01
+7.500000000000000000e+03 3.341795178746836958e-01
+7.520000000000000000e+03 3.344349988534341955e-01
+7.540000000000000000e+03 3.332260762211604055e-01
+7.560000000000000000e+03 3.331830608070346922e-01
+7.580000000000000000e+03 3.298711135874501377e-01
+7.600000000000000000e+03 3.269689508224936647e-01
+7.620000000000000000e+03 3.234669526455535848e-01
+7.640000000000000000e+03 3.188945876469818641e-01
+7.660000000000000000e+03 3.144740486886982711e-01
+7.680000000000000000e+03 3.113076564346033970e-01
+7.700000000000000000e+03 3.055636426807978867e-01
+7.720000000000000000e+03 2.994744442254859695e-01
+7.740000000000000000e+03 2.936319897951902846e-01
+7.760000000000000000e+03 2.845595920183053851e-01
+7.780000000000000000e+03 2.806121050327816113e-01
+7.800000000000000000e+03 2.745157052825408228e-01
+7.820000000000000000e+03 2.651318850419535078e-01
+7.840000000000000000e+03 2.585209636065871064e-01
+7.860000000000000000e+03 2.530669587481049199e-01
+7.880000000000000000e+03 2.464881627405064446e-01
+7.900000000000000000e+03 2.406743817710244038e-01
+7.920000000000000000e+03 2.354438585039373977e-01
+7.940000000000000000e+03 2.285275463972708532e-01
+7.960000000000000000e+03 2.234443732732284416e-01
+7.980000000000000000e+03 2.195122817344314359e-01
+8.000000000000000000e+03 2.136943301987624388e-01
+8.020000000000000000e+03 2.084856610606970195e-01
+8.040000000000000000e+03 2.043419981916429762e-01
+8.060000000000000000e+03 1.993875197984136816e-01
+8.080000000000000000e+03 1.955335064521863953e-01
+8.100000000000000000e+03 1.922159831039149391e-01
+8.120000000000000000e+03 1.869017018935093533e-01
+8.140000000000000000e+03 1.820400563909129188e-01
+8.160000000000000000e+03 1.774780237778252057e-01
+8.180000000000000000e+03 1.737060281058993849e-01
+8.200000000000000000e+03 1.694588745985709799e-01
+8.220000000000000000e+03 1.653843071978200463e-01
+8.240000000000000000e+03 1.592560711484660163e-01
+8.260000000000000000e+03 1.565567838750303864e-01
+8.280000000000000000e+03 1.506990508160362674e-01
+8.300000000000000000e+03 1.480953078201978357e-01
+8.320000000000000000e+03 1.437376111902471110e-01
+8.340000000000000000e+03 1.404729058447849455e-01
+8.360000000000000000e+03 1.372592291057102287e-01
+8.380000000000000000e+03 1.329058031558858766e-01
+8.400000000000000000e+03 1.307410302822971104e-01
+8.420000000000000000e+03 1.264611232238202765e-01
+8.440000000000000000e+03 1.242766651401362027e-01
+8.460000000000000000e+03 1.208566585603343957e-01
+8.480000000000000000e+03 1.211408952218965274e-01
+8.500000000000000000e+03 1.159971059148543898e-01
+8.520000000000000000e+03 1.156794110135086762e-01
+8.540000000000000000e+03 1.134926750170283521e-01
+8.560000000000000000e+03 1.102168508025114235e-01
+8.580000000000000000e+03 1.084476661433103895e-01
+8.600000000000000000e+03 1.063678996107481761e-01
+8.620000000000000000e+03 1.067784882985486489e-01
+8.640000000000000000e+03 1.041553336430688093e-01
+8.660000000000000000e+03 1.020402109396171680e-01
+8.680000000000000000e+03 1.006314137768552081e-01
+8.700000000000000000e+03 9.857542022709921137e-02
+8.720000000000000000e+03 9.653418561820979737e-02
+8.740000000000000000e+03 9.570772023030221787e-02
+8.760000000000000000e+03 9.502518967909456826e-02
+8.780000000000000000e+03 9.125704318931475434e-02
+8.800000000000000000e+03 9.053609484137646601e-02
+8.820000000000000000e+03 8.903474462460286842e-02
+8.840000000000000000e+03 8.712263207902269657e-02
+8.860000000000000000e+03 8.702615551048560605e-02
+8.880000000000000000e+03 8.614488367494706200e-02
+8.900000000000000000e+03 8.469071208522860328e-02
+8.920000000000000000e+03 8.452032332293747674e-02
+8.940000000000000000e+03 8.354251730142032983e-02
+8.960000000000000000e+03 8.312831618683128032e-02
+8.980000000000000000e+03 8.397758417473982773e-02
+9.000000000000000000e+03 8.299107975344817423e-02
+9.020000000000000000e+03 8.341212235828138200e-02
+9.040000000000000000e+03 8.276247063841721263e-02
+9.060000000000000000e+03 8.380120937568864836e-02
+9.080000000000000000e+03 8.390936894661546464e-02
+9.100000000000000000e+03 8.306611052508089399e-02
+9.120000000000000000e+03 8.322584853144904260e-02
+9.140000000000000000e+03 8.302444095302498328e-02
+9.160000000000000000e+03 8.358664328270840049e-02
+9.180000000000000000e+03 8.373778874958179297e-02
+9.200000000000000000e+03 8.329015253129340435e-02
+9.220000000000000000e+03 8.379895247790730695e-02
+9.240000000000000000e+03 8.293657732715227493e-02
+9.260000000000000000e+03 8.342705472074199435e-02
+9.280000000000000000e+03 8.389855332904598562e-02
+9.300000000000000000e+03 8.353722389692258554e-02
+9.320000000000000000e+03 8.371628414300567866e-02
+9.340000000000000000e+03 8.353284327405011145e-02
+9.360000000000000000e+03 8.372392941746052697e-02
+9.380000000000000000e+03 8.420777408855252555e-02
+9.400000000000000000e+03 8.365869767404586488e-02
+9.420000000000000000e+03 8.368499745363083830e-02
+9.440000000000000000e+03 8.286521510379278588e-02
+9.460000000000000000e+03 8.216160124306329249e-02
+9.480000000000000000e+03 8.098376645095871351e-02
+9.500000000000000000e+03 7.900884993664369915e-02
+9.520000000000000000e+03 7.739515770405083761e-02
+9.540000000000000000e+03 7.470269968877611688e-02
+9.560000000000000000e+03 7.290537365533740488e-02
+9.580000000000000000e+03 7.111739872391897865e-02
+9.600000000000000000e+03 6.753647699994888565e-02
+9.620000000000000000e+03 6.462253741359788584e-02
+9.640000000000000000e+03 6.114839144175982649e-02
+9.660000000000000000e+03 5.836441585067562304e-02
+9.680000000000000000e+03 5.520030743697974113e-02
+9.700000000000000000e+03 5.151802857504592797e-02
+9.720000000000000000e+03 4.809081912036581447e-02
+9.740000000000000000e+03 4.507763293296207507e-02
+9.760000000000000000e+03 4.186747962506227883e-02
+9.780000000000000000e+03 3.873394191998657393e-02
+9.800000000000000000e+03 3.537927365930625123e-02
+9.820000000000000000e+03 3.228212663204375887e-02
+9.840000000000000000e+03 2.927699054486324060e-02
+9.860000000000000000e+03 2.657915917384370483e-02
+9.880000000000000000e+03 2.408316715582172265e-02
+9.900000000000000000e+03 2.154984942805426157e-02
+9.920000000000000000e+03 1.938369744705135608e-02
+9.940000000000000000e+03 1.757698930679396643e-02
+9.960000000000000000e+03 1.609397304462095724e-02
+9.980000000000000000e+03 1.469027658303642334e-02
+1.000000000000000000e+04 1.368666642185365455e-02
+1.002000000000000000e+04 1.291044201036543014e-02
+1.004000000000000000e+04 1.216390108682897757e-02
+1.006000000000000000e+04 1.150121547147748766e-02
+1.008000000000000000e+04 1.076443214145479839e-02
+1.010000000000000000e+04 1.005329208594590157e-02
+1.012000000000000000e+04 9.398529569841272344e-03
+1.014000000000000000e+04 8.732196281031586252e-03
+1.016000000000000000e+04 8.141224219461267592e-03
+1.018000000000000000e+04 7.544605863533185297e-03
+1.020000000000000000e+04 6.921036505864287293e-03
+1.022000000000000000e+04 6.371952630320352508e-03
+1.024000000000000000e+04 5.812210196609848140e-03
+1.026000000000000000e+04 5.370073253453029778e-03
+1.028000000000000000e+04 4.877044428434076061e-03
+1.030000000000000000e+04 4.396319799938341356e-03
+1.032000000000000000e+04 3.991872206723765318e-03
+1.034000000000000000e+04 3.600811182396204679e-03
+1.036000000000000000e+04 3.245860720593829116e-03
+1.038000000000000000e+04 2.915740832931405704e-03
+1.040000000000000000e+04 2.615374215278883432e-03
+1.042000000000000000e+04 2.362676314302520827e-03
+1.044000000000000000e+04 2.134084766313759044e-03
+1.046000000000000000e+04 1.947779905279889640e-03
+1.048000000000000000e+04 1.809367063179470863e-03
+1.050000000000000000e+04 1.684137565890356757e-03
+1.052000000000000000e+04 1.592386385136092394e-03
+1.054000000000000000e+04 1.502396623571386827e-03
+1.056000000000000000e+04 1.412937374254588435e-03
+1.058000000000000000e+04 1.332566704508197962e-03
+1.060000000000000000e+04 1.249076612780975057e-03
+1.062000000000000000e+04 1.168011100011822874e-03
+1.064000000000000000e+04 1.093403142437080530e-03
+1.066000000000000000e+04 1.017231975596058101e-03
+1.068000000000000000e+04 9.541878197899651909e-04
+1.070000000000000000e+04 8.818853783550537799e-04
+1.072000000000000000e+04 8.177561499277094569e-04
+1.074000000000000000e+04 7.580692671650877913e-04
+1.076000000000000000e+04 7.049075738400470458e-04
+1.078000000000000000e+04 6.549480091503107494e-04
+1.080000000000000000e+04 6.044486155346169261e-04
+1.082000000000000000e+04 5.592755411023689945e-04
+1.084000000000000000e+04 5.213102213921029819e-04
+1.086000000000000000e+04 4.846714550727942755e-04
+1.088000000000000000e+04 4.552350096777482550e-04
+1.090000000000000000e+04 4.268609951691339915e-04
+1.092000000000000000e+04 4.049802108627010948e-04
+1.094000000000000000e+04 3.869359935817117866e-04
+1.096000000000000000e+04 3.759120063398248800e-04
+1.098000000000000000e+04 3.689708894652466136e-04
+1.100000000000000000e+04 3.650072107129869185e-04

ObservationSim/Instrument/data/throughputs/g_throughput.txt

-# g_css
+# g_cssc
+# lambda_Angst  throughput
  2000.00    0.00000
  2010.00    0.00000
  2020.00    0.00000
@@ -14,102 +15,102 @@
  2120.00    0.00000
  2130.00    0.00000
  2140.00    0.00000
- 2150.00    0.00000
- 2160.00    0.00000
- 2170.00    0.00000
- 2180.00    0.00000
- 2190.00    0.00000
- 2200.00    0.00000
- 2210.00    0.00000
- 2220.00    0.00000
- 2230.00    0.00000
- 2240.00    0.00000
- 2250.00    0.00000
- 2260.00    0.00000
- 2270.00    0.00000
- 2280.00    0.00000
- 2290.00    0.00000
- 2300.00    0.00000
- 2310.00    0.00000
- 2320.00    0.00000
- 2330.00    0.00000
- 2340.00    0.00000
- 2350.00    0.00000
- 2360.00    0.00000
- 2370.00    0.00000
- 2380.00    0.00000
- 2390.00    0.00000
- 2400.00    0.00000
- 2410.00    0.00000
- 2420.00    0.00000
- 2430.00    0.00000
- 2440.00    0.00000
- 2450.00    0.00000
- 2460.00    0.00000
- 2470.00    0.00000
- 2480.00    0.00000
- 2490.00    0.00000
- 2500.00    0.00000
- 2510.00    0.00000
- 2520.00    0.00000
- 2530.00    0.00000
- 2540.00    0.00000
- 2550.00    0.00000
- 2560.00    0.00000
- 2570.00    0.00000
- 2580.00    0.00000
- 2590.00    0.00000
- 2600.00    0.00000
- 2610.00    0.00000
- 2620.00    0.00000
- 2630.00    0.00000
- 2640.00    0.00000
- 2650.00    0.00000
- 2660.00    0.00000
- 2670.00    0.00000
- 2680.00    0.00000
- 2690.00    0.00000
- 2700.00    0.00000
- 2710.00    0.00000
- 2720.00    0.00000
- 2730.00    0.00000
- 2740.00    0.00000
- 2750.00    0.00000
- 2760.00    0.00000
- 2770.00    0.00000
- 2780.00    0.00000
- 2790.00    0.00000
- 2800.00    0.00000
- 2810.00    0.00000
- 2820.00    0.00000
- 2830.00    0.00000
- 2840.00    0.00000
- 2850.00    0.00000
- 2860.00    0.00000
- 2870.00    0.00000
- 2880.00    0.00000
- 2890.00    0.00000
- 2900.00    0.00000
- 2910.00    0.00000
- 2920.00    0.00000
- 2930.00    0.00000
- 2940.00    0.00000
- 2950.00    0.00000
- 2960.00    0.00000
- 2970.00    0.00000
- 2980.00    0.00000
- 2990.00    0.00000
- 3000.00    0.00000
- 3010.00    0.00000
- 3020.00    0.00000
- 3030.00    0.00000
- 3040.00    0.00000
- 3050.00    0.00000
- 3060.00    0.00000
- 3070.00    0.00000
- 3080.00    0.00000
- 3090.00    0.00000
- 3100.00    0.00000
+ 2150.00    0.00001
+ 2160.00    0.00001
+ 2170.00    0.00001
+ 2180.00    0.00001
+ 2190.00    0.00001
+ 2200.00    0.00001
+ 2210.00    0.00001
+ 2220.00    0.00002
+ 2230.00    0.00002
+ 2240.00    0.00002
+ 2250.00    0.00002
+ 2260.00    0.00003
+ 2270.00    0.00003
+ 2280.00    0.00003
+ 2290.00    0.00004
+ 2300.00    0.00004
+ 2310.00    0.00005
+ 2320.00    0.00005
+ 2330.00    0.00006
+ 2340.00    0.00006
+ 2350.00    0.00007
+ 2360.00    0.00007
+ 2370.00    0.00008
+ 2380.00    0.00008
+ 2390.00    0.00009
+ 2400.00    0.00010
+ 2410.00    0.00011
+ 2420.00    0.00011
+ 2430.00    0.00012
+ 2440.00    0.00013
+ 2450.00    0.00014
+ 2460.00    0.00015
+ 2470.00    0.00016
+ 2480.00    0.00017
+ 2490.00    0.00018
+ 2500.00    0.00019
+ 2510.00    0.00019
+ 2520.00    0.00020
+ 2530.00    0.00021
+ 2540.00    0.00022
+ 2550.00    0.00023
+ 2560.00    0.00023
+ 2570.00    0.00022
+ 2580.00    0.00022
+ 2590.00    0.00021
+ 2600.00    0.00021
+ 2610.00    0.00021
+ 2620.00    0.00021
+ 2630.00    0.00021
+ 2640.00    0.00020
+ 2650.00    0.00020
+ 2660.00    0.00019
+ 2670.00    0.00018
+ 2680.00    0.00017
+ 2690.00    0.00017
+ 2700.00    0.00017
+ 2710.00    0.00016
+ 2720.00    0.00016
+ 2730.00    0.00016
+ 2740.00    0.00015
+ 2750.00    0.00015
+ 2760.00    0.00015
+ 2770.00    0.00016
+ 2780.00    0.00016
+ 2790.00    0.00017
+ 2800.00    0.00017
+ 2810.00    0.00018
+ 2820.00    0.00019
+ 2830.00    0.00019
+ 2840.00    0.00019
+ 2850.00    0.00020
+ 2860.00    0.00020
+ 2870.00    0.00021
+ 2880.00    0.00021
+ 2890.00    0.00022
+ 2900.00    0.00022
+ 2910.00    0.00023
+ 2920.00    0.00023
+ 2930.00    0.00023
+ 2940.00    0.00023
+ 2950.00    0.00023
+ 2960.00    0.00022
+ 2970.00    0.00022
+ 2980.00    0.00022
+ 2990.00    0.00023
+ 3000.00    0.00023
+ 3010.00    0.00029
+ 3020.00    0.00029
+ 3030.00    0.00023
+ 3040.00    0.00015
+ 3050.00    0.00008
+ 3060.00    0.00003
+ 3070.00    0.00002
+ 3080.00    0.00001
+ 3090.00    0.00001
+ 3100.00    0.00001
  3110.00    0.00000
  3120.00    0.00000
  3130.00    0.00000
@@ -184,194 +185,194 @@
  3820.00    0.00000
  3830.00    0.00000
  3840.00    0.00000
- 3850.00    0.00000
- 3860.00    0.00000
- 3870.00    0.00000
- 3880.00    0.00000
- 3890.00    0.00000
- 3900.00    0.00000
- 3910.00    0.00000
- 3920.00    0.00000
- 3930.00    0.00000
- 3940.00    0.00000
- 3950.00    0.00000
- 3960.00    0.00000
- 3970.00    0.00000
- 3980.00    0.00000
- 3990.00    0.00000
- 4000.00    0.00000
- 4010.00    0.00000
- 4020.00    0.04006
- 4030.00    0.12152
- 4040.00    0.20475
- 4050.00    0.28977
- 4060.00    0.37657
- 4070.00    0.42288
- 4080.00    0.42736
- 4090.00    0.43186
- 4100.00    0.43636
- 4110.00    0.44008
- 4120.00    0.44382
- 4130.00    0.44756
- 4140.00    0.45131
- 4150.00    0.45506
- 4160.00    0.45883
- 4170.00    0.46261
- 4180.00    0.46639
- 4190.00    0.47019
- 4200.00    0.47399
- 4210.00    0.47680
- 4220.00    0.47961
- 4230.00    0.48243
- 4240.00    0.48525
- 4250.00    0.48808
- 4260.00    0.49092
- 4270.00    0.49376
- 4280.00    0.49661
- 4290.00    0.49947
- 4300.00    0.50233
- 4310.00    0.50513
- 4320.00    0.50793
- 4330.00    0.51074
- 4340.00    0.51356
- 4350.00    0.51638
- 4360.00    0.51921
- 4370.00    0.52204
- 4380.00    0.52488
- 4390.00    0.52773
- 4400.00    0.53058
- 4410.00    0.53337
- 4420.00    0.53616
- 4430.00    0.53896
- 4440.00    0.54177
- 4450.00    0.54458
- 4460.00    0.54740
- 4470.00    0.55022
- 4480.00    0.55305
- 4490.00    0.55588
- 4500.00    0.55872
- 4510.00    0.56107
- 4520.00    0.56344
- 4530.00    0.56580
- 4540.00    0.56817
- 4550.00    0.57054
- 4560.00    0.57292
- 4570.00    0.57530
- 4580.00    0.57769
- 4590.00    0.58008
- 4600.00    0.58248
- 4610.00    0.58480
- 4620.00    0.58714
- 4630.00    0.58947
- 4640.00    0.59182
- 4650.00    0.59416
- 4660.00    0.59651
- 4670.00    0.59886
- 4680.00    0.60122
- 4690.00    0.60358
- 4700.00    0.60595
- 4710.00    0.60810
- 4720.00    0.61026
- 4730.00    0.61243
- 4740.00    0.61459
- 4750.00    0.61668
- 4760.00    0.61805
- 4770.00    0.61942
- 4780.00    0.62078
- 4790.00    0.62215
- 4800.00    0.62352
- 4810.00    0.62467
- 4820.00    0.62582
- 4830.00    0.62698
- 4840.00    0.62813
- 4850.00    0.62928
- 4860.00    0.63043
- 4870.00    0.63158
- 4880.00    0.63274
- 4890.00    0.63389
- 4900.00    0.63504
- 4910.00    0.63590
- 4920.00    0.63677
- 4930.00    0.63763
- 4940.00    0.63850
- 4950.00    0.63936
- 4960.00    0.64022
- 4970.00    0.64109
- 4980.00    0.64195
- 4990.00    0.64282
- 5000.00    0.64368
- 5010.00    0.64433
- 5020.00    0.64498
- 5030.00    0.64562
- 5040.00    0.64627
- 5050.00    0.64692
- 5060.00    0.64757
- 5070.00    0.64822
- 5080.00    0.64886
- 5090.00    0.64951
- 5100.00    0.65016
- 5110.00    0.65095
- 5120.00    0.65174
- 5130.00    0.65254
- 5140.00    0.65333
- 5150.00    0.65412
- 5160.00    0.65491
- 5170.00    0.65570
- 5180.00    0.65650
- 5190.00    0.65729
- 5200.00    0.65808
- 5210.00    0.65866
- 5220.00    0.65923
- 5230.00    0.65981
- 5240.00    0.66038
- 5250.00    0.66096
- 5260.00    0.66154
- 5270.00    0.66211
- 5280.00    0.66269
- 5290.00    0.66326
- 5300.00    0.66384
- 5310.00    0.66406
- 5320.00    0.66427
- 5330.00    0.66449
- 5340.00    0.66470
- 5350.00    0.66492
- 5360.00    0.66514
- 5370.00    0.66535
- 5380.00    0.66557
- 5390.00    0.66578
- 5400.00    0.66600
- 5410.00    0.66622
- 5420.00    0.66643
- 5430.00    0.66665
- 5440.00    0.66686
- 5450.00    0.66708
- 5460.00    0.66730
- 5470.00    0.66751
- 5480.00    0.66773
- 5490.00    0.55662
- 5500.00    0.44544
- 5510.00    0.33422
- 5520.00    0.22291
- 5530.00    0.11150
- 5540.00    0.00000
- 5550.00    0.00000
- 5560.00    0.00000
- 5570.00    0.00000
- 5580.00    0.00000
- 5590.00    0.00000
- 5600.00    0.00000
- 5610.00    0.00000
- 5620.00    0.00000
- 5630.00    0.00000
- 5640.00    0.00000
- 5650.00    0.00000
- 5660.00    0.00000
- 5670.00    0.00000
- 5680.00    0.00000
- 5690.00    0.00000
- 5700.00    0.00000
- 5710.00    0.00000
- 5720.00    0.00000
+ 3850.00    0.00001
+ 3860.00    0.00001
+ 3870.00    0.00002
+ 3880.00    0.00003
+ 3890.00    0.00006
+ 3900.00    0.00009
+ 3910.00    0.00015
+ 3920.00    0.00026
+ 3930.00    0.00050
+ 3940.00    0.00100
+ 3950.00    0.00205
+ 3960.00    0.00437
+ 3970.00    0.00962
+ 3980.00    0.02183
+ 3990.00    0.04851
+ 4000.00    0.09436
+ 4010.00    0.15746
+ 4020.00    0.22882
+ 4030.00    0.29197
+ 4040.00    0.33603
+ 4050.00    0.35924
+ 4060.00    0.36793
+ 4070.00    0.37436
+ 4080.00    0.38515
+ 4090.00    0.40138
+ 4100.00    0.41976
+ 4110.00    0.43396
+ 4120.00    0.44410
+ 4130.00    0.45148
+ 4140.00    0.45555
+ 4150.00    0.45950
+ 4160.00    0.46325
+ 4170.00    0.46808
+ 4180.00    0.47311
+ 4190.00    0.47932
+ 4200.00    0.48490
+ 4210.00    0.48809
+ 4220.00    0.49160
+ 4230.00    0.49607
+ 4240.00    0.50154
+ 4250.00    0.50660
+ 4260.00    0.51182
+ 4270.00    0.51588
+ 4280.00    0.51954
+ 4290.00    0.52298
+ 4300.00    0.52681
+ 4310.00    0.53111
+ 4320.00    0.53565
+ 4330.00    0.54065
+ 4340.00    0.54552
+ 4350.00    0.54842
+ 4360.00    0.55056
+ 4370.00    0.55320
+ 4380.00    0.55497
+ 4390.00    0.55628
+ 4400.00    0.55810
+ 4410.00    0.56022
+ 4420.00    0.56418
+ 4430.00    0.56784
+ 4440.00    0.57139
+ 4450.00    0.57177
+ 4460.00    0.57109
+ 4470.00    0.57056
+ 4480.00    0.57073
+ 4490.00    0.57231
+ 4500.00    0.57505
+ 4510.00    0.57659
+ 4520.00    0.57743
+ 4530.00    0.57720
+ 4540.00    0.57605
+ 4550.00    0.57356
+ 4560.00    0.57143
+ 4570.00    0.57015
+ 4580.00    0.56881
+ 4590.00    0.56722
+ 4600.00    0.56571
+ 4610.00    0.56305
+ 4620.00    0.56048
+ 4630.00    0.55917
+ 4640.00    0.55810
+ 4650.00    0.55639
+ 4660.00    0.55511
+ 4670.00    0.55352
+ 4680.00    0.55241
+ 4690.00    0.55337
+ 4700.00    0.55467
+ 4710.00    0.55663
+ 4720.00    0.55920
+ 4730.00    0.56196
+ 4740.00    0.56446
+ 4750.00    0.57075
+ 4760.00    0.57642
+ 4770.00    0.57513
+ 4780.00    0.57322
+ 4790.00    0.57242
+ 4800.00    0.57303
+ 4810.00    0.57907
+ 4820.00    0.58632
+ 4830.00    0.59307
+ 4840.00    0.59971
+ 4850.00    0.60540
+ 4860.00    0.61026
+ 4870.00    0.61448
+ 4880.00    0.61726
+ 4890.00    0.62186
+ 4900.00    0.62654
+ 4910.00    0.63196
+ 4920.00    0.63856
+ 4930.00    0.64481
+ 4940.00    0.65124
+ 4950.00    0.65668
+ 4960.00    0.66159
+ 4970.00    0.66490
+ 4980.00    0.66745
+ 4990.00    0.67020
+ 5000.00    0.67297
+ 5010.00    0.67341
+ 5020.00    0.67379
+ 5030.00    0.67496
+ 5040.00    0.67633
+ 5050.00    0.67812
+ 5060.00    0.68082
+ 5070.00    0.68378
+ 5080.00    0.68717
+ 5090.00    0.69072
+ 5100.00    0.69383
+ 5110.00    0.69629
+ 5120.00    0.69830
+ 5130.00    0.69963
+ 5140.00    0.70051
+ 5150.00    0.70226
+ 5160.00    0.70355
+ 5170.00    0.70512
+ 5180.00    0.70682
+ 5190.00    0.70669
+ 5200.00    0.70497
+ 5210.00    0.70215
+ 5220.00    0.69898
+ 5230.00    0.69597
+ 5240.00    0.69425
+ 5250.00    0.69655
+ 5260.00    0.69875
+ 5270.00    0.69979
+ 5280.00    0.69936
+ 5290.00    0.69911
+ 5300.00    0.69912
+ 5310.00    0.69944
+ 5320.00    0.70162
+ 5330.00    0.70301
+ 5340.00    0.70379
+ 5350.00    0.70471
+ 5360.00    0.70421
+ 5370.00    0.70443
+ 5380.00    0.70456
+ 5390.00    0.70318
+ 5400.00    0.70132
+ 5410.00    0.69908
+ 5420.00    0.69593
+ 5430.00    0.69241
+ 5440.00    0.68567
+ 5450.00    0.66743
+ 5460.00    0.62882
+ 5470.00    0.56275
+ 5480.00    0.47122
+ 5490.00    0.36060
+ 5500.00    0.24974
+ 5510.00    0.15776
+ 5520.00    0.08989
+ 5530.00    0.04709
+ 5540.00    0.02357
+ 5550.00    0.01164
+ 5560.00    0.00594
+ 5570.00    0.00313
+ 5580.00    0.00172
+ 5590.00    0.00099
+ 5600.00    0.00058
+ 5610.00    0.00035
+ 5620.00    0.00022
+ 5630.00    0.00014
+ 5640.00    0.00009
+ 5650.00    0.00006
+ 5660.00    0.00004
+ 5670.00    0.00003
+ 5680.00    0.00002
+ 5690.00    0.00001
+ 5700.00    0.00001
+ 5710.00    0.00001
+ 5720.00    0.00001
  5730.00    0.00000
  5740.00    0.00000
  5750.00    0.00000
@@ -599,115 +600,115 @@
  7970.00    0.00000
  7980.00    0.00000
  7990.00    0.00000
- 8000.00    0.00000
- 8010.00    0.00000
- 8020.00    0.00000
- 8030.00    0.00000
- 8040.00    0.00000
+ 8000.00    0.00002
+ 8010.00    0.00004
+ 8020.00    0.00002
+ 8030.00    0.00002
+ 8040.00    0.00002
  8050.00    0.00000
  8060.00    0.00000
- 8070.00    0.00000
- 8080.00    0.00000
- 8090.00    0.00000
+ 8070.00    0.00004
+ 8080.00    0.00004
+ 8090.00    0.00002
  8100.00    0.00000
- 8110.00    0.00000
- 8120.00    0.00000
- 8130.00    0.00000
- 8140.00    0.00000
- 8150.00    0.00000
- 8160.00    0.00000
- 8170.00    0.00000
- 8180.00    0.00000
- 8190.00    0.00000
- 8200.00    0.00000
- 8210.00    0.00000
- 8220.00    0.00000
+ 8110.00    0.00001
+ 8120.00    0.00001
+ 8130.00    0.00002
+ 8140.00    0.00002
+ 8150.00    0.00003
+ 8160.00    0.00002
+ 8170.00    0.00001
+ 8180.00    0.00001
+ 8190.00    0.00002
+ 8200.00    0.00002
+ 8210.00    0.00001
+ 8220.00    0.00001
  8230.00    0.00000
- 8240.00    0.00000
- 8250.00    0.00000
- 8260.00    0.00000
- 8270.00    0.00000
- 8280.00    0.00000
- 8290.00    0.00000
- 8300.00    0.00000
- 8310.00    0.00000
- 8320.00    0.00000
- 8330.00    0.00000
- 8340.00    0.00000
- 8350.00    0.00000
- 8360.00    0.00000
- 8370.00    0.00000
- 8380.00    0.00000
- 8390.00    0.00000
- 8400.00    0.00000
- 8410.00    0.00000
- 8420.00    0.00000
- 8430.00    0.00000
- 8440.00    0.00000
- 8450.00    0.00000
- 8460.00    0.00000
- 8470.00    0.00000
- 8480.00    0.00000
- 8490.00    0.00000
- 8500.00    0.00000
- 8510.00    0.00000
- 8520.00    0.00000
- 8530.00    0.00000
- 8540.00    0.00000
- 8550.00    0.00000
- 8560.00    0.00000
- 8570.00    0.00000
- 8580.00    0.00000
- 8590.00    0.00000
- 8600.00    0.00000
- 8610.00    0.00000
- 8620.00    0.00000
- 8630.00    0.00000
- 8640.00    0.00000
- 8650.00    0.00000
- 8660.00    0.00000
- 8670.00    0.00000
+ 8240.00    0.00001
+ 8250.00    0.00001
+ 8260.00    0.00002
+ 8270.00    0.00001
+ 8280.00    0.00001
+ 8290.00    0.00001
+ 8300.00    0.00002
+ 8310.00    0.00001
+ 8320.00    0.00001
+ 8330.00    0.00001
+ 8340.00    0.00001
+ 8350.00    0.00001
+ 8360.00    0.00002
+ 8370.00    0.00001
+ 8380.00    0.00001
+ 8390.00    0.00002
+ 8400.00    0.00001
+ 8410.00    0.00001
+ 8420.00    0.00002
+ 8430.00    0.00001
+ 8440.00    0.00001
+ 8450.00    0.00001
+ 8460.00    0.00001
+ 8470.00    0.00002
+ 8480.00    0.00001
+ 8490.00    0.00002
+ 8500.00    0.00002
+ 8510.00    0.00001
+ 8520.00    0.00001
+ 8530.00    0.00001
+ 8540.00    0.00001
+ 8550.00    0.00001
+ 8560.00    0.00002
+ 8570.00    0.00001
+ 8580.00    0.00001
+ 8590.00    0.00001
+ 8600.00    0.00001
+ 8610.00    0.00001
+ 8620.00    0.00001
+ 8630.00    0.00001
+ 8640.00    0.00001
+ 8650.00    0.00001
+ 8660.00    0.00001
+ 8670.00    0.00001
  8680.00    0.00000
  8690.00    0.00000
- 8700.00    0.00000
+ 8700.00    0.00001
  8710.00    0.00000
- 8720.00    0.00000
- 8730.00    0.00000
+ 8720.00    0.00001
+ 8730.00    0.00001
  8740.00    0.00000
  8750.00    0.00000
- 8760.00    0.00000
- 8770.00    0.00000
- 8780.00    0.00000
- 8790.00    0.00000
- 8800.00    0.00000
- 8810.00    0.00000
- 8820.00    0.00000
- 8830.00    0.00000
- 8840.00    0.00000
- 8850.00    0.00000
- 8860.00    0.00000
- 8870.00    0.00000
- 8880.00    0.00000
+ 8760.00    0.00001
+ 8770.00    0.00001
+ 8780.00    0.00001
+ 8790.00    0.00001
+ 8800.00    0.00001
+ 8810.00    0.00001
+ 8820.00    0.00001
+ 8830.00    0.00001
+ 8840.00    0.00001
+ 8850.00    0.00001
+ 8860.00    0.00001
+ 8870.00    0.00001
+ 8880.00    0.00001
  8890.00    0.00000
- 8900.00    0.00000
- 8910.00    0.00000
- 8920.00    0.00000
+ 8900.00    0.00001
+ 8910.00    0.00001
+ 8920.00    0.00001
  8930.00    0.00000
- 8940.00    0.00000
- 8950.00    0.00000
- 8960.00    0.00000
- 8970.00    0.00000
+ 8940.00    0.00001
+ 8950.00    0.00001
+ 8960.00    0.00001
+ 8970.00    0.00001
  8980.00    0.00000
  8990.00    0.00000
  9000.00    0.00000
- 9010.00    0.00000
+ 9010.00    0.00001
  9020.00    0.00000
  9030.00    0.00000
  9040.00    0.00000
  9050.00    0.00000
  9060.00    0.00000
  9070.00    0.00000
- 9080.00    0.00000
+ 9080.00    0.00001
  9090.00    0.00000
  9100.00    0.00000
  9110.00    0.00000

ObservationSim/Instrument/data/throughputs/i_throughput.txt

-# i_css
+# i_cssc
+# lambda_Angst  throughput
  2000.00    0.00000
  2010.00    0.00000
  2020.00    0.00000
@@ -458,227 +459,227 @@
  6560.00    0.00000
  6570.00    0.00000
  6580.00    0.00000
- 6590.00    0.00000
- 6600.00    0.00000
- 6610.00    0.00000
- 6620.00    0.00000
- 6630.00    0.00000
- 6640.00    0.00000
- 6650.00    0.00000
- 6660.00    0.00000
- 6670.00    0.00000
- 6680.00    0.00000
- 6690.00    0.00000
- 6700.00    0.00000
- 6710.00    0.00000
- 6720.00    0.00000
- 6730.00    0.00000
- 6740.00    0.00000
- 6750.00    0.00000
- 6760.00    0.00000
- 6770.00    0.00000
- 6780.00    0.00000
- 6790.00    0.00000
- 6800.00    0.00000
- 6810.00    0.00000
- 6820.00    0.00000
- 6830.00    0.00000
- 6840.00    0.00000
- 6850.00    0.00000
- 6860.00    0.04595
- 6870.00    0.13800
- 6880.00    0.23026
- 6890.00    0.32274
- 6900.00    0.41542
- 6910.00    0.50826
- 6920.00    0.60128
- 6930.00    0.64820
- 6940.00    0.64886
- 6950.00    0.64952
- 6960.00    0.65018
- 6970.00    0.65084
- 6980.00    0.65151
- 6990.00    0.65217
- 7000.00    0.65283
- 7010.00    0.65335
- 7020.00    0.65386
- 7030.00    0.65438
- 7040.00    0.65489
- 7050.00    0.65541
- 7060.00    0.65592
- 7070.00    0.65644
- 7080.00    0.65695
- 7090.00    0.65747
- 7100.00    0.65798
- 7110.00    0.65843
- 7120.00    0.65887
- 7130.00    0.65931
- 7140.00    0.65975
- 7150.00    0.66019
- 7160.00    0.66063
- 7170.00    0.66108
- 7180.00    0.66152
- 7190.00    0.66196
- 7200.00    0.66240
- 7210.00    0.66262
- 7220.00    0.66284
- 7230.00    0.66306
- 7240.00    0.66328
- 7250.00    0.66350
- 7260.00    0.66372
- 7270.00    0.66395
- 7280.00    0.66417
- 7290.00    0.66439
- 7300.00    0.66461
- 7310.00    0.66483
- 7320.00    0.66505
- 7330.00    0.66527
- 7340.00    0.66549
- 7350.00    0.66571
- 7360.00    0.66593
- 7370.00    0.66615
- 7380.00    0.66637
- 7390.00    0.66660
- 7400.00    0.66682
- 7410.00    0.66689
- 7420.00    0.66696
- 7430.00    0.66704
- 7440.00    0.66711
- 7450.00    0.66718
- 7460.00    0.66726
- 7470.00    0.66733
- 7480.00    0.66740
- 7490.00    0.66748
- 7500.00    0.66755
- 7510.00    0.66755
- 7520.00    0.66755
- 7530.00    0.66755
- 7540.00    0.66755
- 7550.00    0.66755
- 7560.00    0.66755
- 7570.00    0.66755
- 7580.00    0.66755
- 7590.00    0.66755
- 7600.00    0.66755
- 7610.00    0.66755
- 7620.00    0.66755
- 7630.00    0.66755
- 7640.00    0.66755
- 7650.00    0.66755
- 7660.00    0.66755
- 7670.00    0.66755
- 7680.00    0.66755
- 7690.00    0.66755
- 7700.00    0.66755
- 7710.00    0.66733
- 7720.00    0.66711
- 7730.00    0.66689
- 7740.00    0.66667
- 7750.00    0.66645
- 7760.00    0.66623
- 7770.00    0.66601
- 7780.00    0.66579
- 7790.00    0.66556
- 7800.00    0.66534
- 7810.00    0.66490
- 7820.00    0.66446
- 7830.00    0.66402
- 7840.00    0.66358
- 7850.00    0.66314
- 7860.00    0.66269
- 7870.00    0.66225
- 7880.00    0.66181
- 7890.00    0.66137
- 7900.00    0.66093
- 7910.00    0.66027
- 7920.00    0.65960
- 7930.00    0.65894
- 7940.00    0.65828
- 7950.00    0.65762
- 7960.00    0.65695
- 7970.00    0.65629
- 7980.00    0.65563
- 7990.00    0.65497
- 8000.00    0.65430
- 8010.00    0.65364
- 8020.00    0.65298
- 8030.00    0.65232
- 8040.00    0.65165
- 8050.00    0.65099
- 8060.00    0.65033
- 8070.00    0.64967
- 8080.00    0.64900
- 8090.00    0.64834
- 8100.00    0.64768
- 8110.00    0.64665
- 8120.00    0.64562
- 8130.00    0.64459
- 8140.00    0.64356
- 8150.00    0.64253
- 8160.00    0.64150
- 8170.00    0.64047
- 8180.00    0.63944
- 8190.00    0.63841
- 8200.00    0.63738
- 8210.00    0.63605
- 8220.00    0.63473
- 8230.00    0.63340
- 8240.00    0.63208
- 8250.00    0.63075
- 8260.00    0.62943
- 8270.00    0.62810
- 8280.00    0.62678
- 8290.00    0.62545
- 8300.00    0.62413
- 8310.00    0.62251
- 8320.00    0.58640
- 8330.00    0.51606
- 8340.00    0.44608
- 8350.00    0.37646
- 8360.00    0.30721
- 8370.00    0.23831
- 8380.00    0.16977
- 8390.00    0.10159
- 8400.00    0.03377
- 8410.00    0.00000
- 8420.00    0.00000
- 8430.00    0.00000
- 8440.00    0.00000
- 8450.00    0.00000
- 8460.00    0.00000
- 8470.00    0.00000
- 8480.00    0.00000
- 8490.00    0.00000
- 8500.00    0.00000
- 8510.00    0.00000
- 8520.00    0.00000
- 8530.00    0.00000
- 8540.00    0.00000
- 8550.00    0.00000
- 8560.00    0.00000
- 8570.00    0.00000
- 8580.00    0.00000
- 8590.00    0.00000
- 8600.00    0.00000
- 8610.00    0.00000
- 8620.00    0.00000
- 8630.00    0.00000
- 8640.00    0.00000
- 8650.00    0.00000
- 8660.00    0.00000
- 8670.00    0.00000
- 8680.00    0.00000
- 8690.00    0.00000
- 8700.00    0.00000
- 8710.00    0.00000
- 8720.00    0.00000
- 8730.00    0.00000
- 8740.00    0.00000
- 8750.00    0.00000
- 8760.00    0.00000
+ 6590.00    0.00001
+ 6600.00    0.00001
+ 6610.00    0.00001
+ 6620.00    0.00002
+ 6630.00    0.00003
+ 6640.00    0.00004
+ 6650.00    0.00007
+ 6660.00    0.00008
+ 6670.00    0.00009
+ 6680.00    0.00014
+ 6690.00    0.00018
+ 6700.00    0.00025
+ 6710.00    0.00035
+ 6720.00    0.00049
+ 6730.00    0.00068
+ 6740.00    0.00095
+ 6750.00    0.00136
+ 6760.00    0.00199
+ 6770.00    0.00294
+ 6780.00    0.00445
+ 6790.00    0.00684
+ 6800.00    0.01071
+ 6810.00    0.01708
+ 6820.00    0.02711
+ 6830.00    0.04282
+ 6840.00    0.06652
+ 6850.00    0.09888
+ 6860.00    0.14166
+ 6870.00    0.19419
+ 6880.00    0.25385
+ 6890.00    0.31733
+ 6900.00    0.37981
+ 6910.00    0.43796
+ 6920.00    0.48951
+ 6930.00    0.53083
+ 6940.00    0.56324
+ 6950.00    0.58455
+ 6960.00    0.59682
+ 6970.00    0.60561
+ 6980.00    0.60940
+ 6990.00    0.60835
+ 7000.00    0.60618
+ 7010.00    0.60527
+ 7020.00    0.60577
+ 7030.00    0.60793
+ 7040.00    0.61200
+ 7050.00    0.61709
+ 7060.00    0.62322
+ 7070.00    0.63095
+ 7080.00    0.63821
+ 7090.00    0.64292
+ 7100.00    0.64626
+ 7110.00    0.64878
+ 7120.00    0.64997
+ 7130.00    0.65232
+ 7140.00    0.65406
+ 7150.00    0.65226
+ 7160.00    0.65081
+ 7170.00    0.65292
+ 7180.00    0.65541
+ 7190.00    0.65667
+ 7200.00    0.65711
+ 7210.00    0.65967
+ 7220.00    0.66207
+ 7230.00    0.66313
+ 7240.00    0.66374
+ 7250.00    0.66539
+ 7260.00    0.66680
+ 7270.00    0.66685
+ 7280.00    0.66702
+ 7290.00    0.66646
+ 7300.00    0.66629
+ 7310.00    0.66932
+ 7320.00    0.67278
+ 7330.00    0.67504
+ 7340.00    0.67726
+ 7350.00    0.67778
+ 7360.00    0.67831
+ 7370.00    0.68199
+ 7380.00    0.68577
+ 7390.00    0.68984
+ 7400.00    0.69362
+ 7410.00    0.69332
+ 7420.00    0.69276
+ 7430.00    0.69385
+ 7440.00    0.69474
+ 7450.00    0.69416
+ 7460.00    0.69332
+ 7470.00    0.69433
+ 7480.00    0.69497
+ 7490.00    0.69420
+ 7500.00    0.69362
+ 7510.00    0.69276
+ 7520.00    0.69222
+ 7530.00    0.69099
+ 7540.00    0.69025
+ 7550.00    0.69202
+ 7560.00    0.69383
+ 7570.00    0.69339
+ 7580.00    0.69343
+ 7590.00    0.69509
+ 7600.00    0.69705
+ 7610.00    0.69930
+ 7620.00    0.70161
+ 7630.00    0.70368
+ 7640.00    0.70584
+ 7650.00    0.70841
+ 7660.00    0.71096
+ 7670.00    0.71507
+ 7680.00    0.71902
+ 7690.00    0.71999
+ 7700.00    0.72073
+ 7710.00    0.72065
+ 7720.00    0.72011
+ 7730.00    0.71996
+ 7740.00    0.71957
+ 7750.00    0.71536
+ 7760.00    0.71111
+ 7770.00    0.71377
+ 7780.00    0.71623
+ 7790.00    0.71655
+ 7800.00    0.71724
+ 7810.00    0.71336
+ 7820.00    0.70964
+ 7830.00    0.70962
+ 7840.00    0.70961
+ 7850.00    0.71095
+ 7860.00    0.71248
+ 7870.00    0.71171
+ 7880.00    0.71055
+ 7890.00    0.70995
+ 7900.00    0.70901
+ 7910.00    0.70812
+ 7920.00    0.70705
+ 7930.00    0.70299
+ 7940.00    0.69865
+ 7950.00    0.69705
+ 7960.00    0.69556
+ 7970.00    0.69552
+ 7980.00    0.69573
+ 7990.00    0.69293
+ 8000.00    0.69054
+ 8010.00    0.68913
+ 8020.00    0.68773
+ 8030.00    0.68869
+ 8040.00    0.68958
+ 8050.00    0.68922
+ 8060.00    0.68897
+ 8070.00    0.69058
+ 8080.00    0.69198
+ 8090.00    0.69425
+ 8100.00    0.69658
+ 8110.00    0.69466
+ 8120.00    0.69258
+ 8130.00    0.69134
+ 8140.00    0.69023
+ 8150.00    0.68944
+ 8160.00    0.68843
+ 8170.00    0.68879
+ 8180.00    0.68882
+ 8190.00    0.68806
+ 8200.00    0.68653
+ 8210.00    0.68482
+ 8220.00    0.68292
+ 8230.00    0.67639
+ 8240.00    0.67012
+ 8250.00    0.67081
+ 8260.00    0.67174
+ 8270.00    0.66608
+ 8280.00    0.66080
+ 8290.00    0.66262
+ 8300.00    0.66391
+ 8310.00    0.65922
+ 8320.00    0.65126
+ 8330.00    0.64064
+ 8340.00    0.62381
+ 8350.00    0.59850
+ 8360.00    0.56510
+ 8370.00    0.52167
+ 8380.00    0.46983
+ 8390.00    0.41697
+ 8400.00    0.36189
+ 8410.00    0.30067
+ 8420.00    0.24099
+ 8430.00    0.18838
+ 8440.00    0.13948
+ 8450.00    0.09907
+ 8460.00    0.06956
+ 8470.00    0.04814
+ 8480.00    0.03312
+ 8490.00    0.02220
+ 8500.00    0.01492
+ 8510.00    0.01022
+ 8520.00    0.00717
+ 8530.00    0.00507
+ 8540.00    0.00360
+ 8550.00    0.00259
+ 8560.00    0.00188
+ 8570.00    0.00137
+ 8580.00    0.00101
+ 8590.00    0.00078
+ 8600.00    0.00058
+ 8610.00    0.00046
+ 8620.00    0.00036
+ 8630.00    0.00028
+ 8640.00    0.00021
+ 8650.00    0.00017
+ 8660.00    0.00012
+ 8670.00    0.00011
+ 8680.00    0.00008
+ 8690.00    0.00006
+ 8700.00    0.00005
+ 8710.00    0.00004
+ 8720.00    0.00002
+ 8730.00    0.00003
+ 8740.00    0.00002
+ 8750.00    0.00002
+ 8760.00    0.00001
  8770.00    0.00000
- 8780.00    0.00000
- 8790.00    0.00000
+ 8780.00    0.00001
+ 8790.00    0.00001
  8800.00    0.00000
  8810.00    0.00000
  8820.00    0.00000

ObservationSim/Instrument/data/throughputs/nuv_throughput.txt

-# NUV_css
+# NUV_cssc
+# lambda_Angst  throughput
  2000.00    0.00000
  2010.00    0.00000
  2020.00    0.00000
@@ -49,79 +50,79 @@
  2470.00    0.00000
  2480.00    0.00000
  2490.00    0.00000
- 2500.00    0.02686
- 2510.00    0.08110
- 2520.00    0.13603
- 2530.00    0.16427
- 2540.00    0.16530
- 2550.00    0.16634
- 2560.00    0.16730
- 2570.00    0.16827
- 2580.00    0.16924
- 2590.00    0.17021
- 2600.00    0.17118
- 2610.00    0.17154
- 2620.00    0.17190
- 2630.00    0.17225
- 2640.00    0.17261
- 2650.00    0.17297
- 2660.00    0.17347
- 2670.00    0.17396
- 2680.00    0.17446
- 2690.00    0.17496
- 2700.00    0.17545
- 2710.00    0.17685
- 2720.00    0.17826
- 2730.00    0.17966
- 2740.00    0.18107
- 2750.00    0.18247
- 2760.00    0.18444
- 2770.00    0.18641
- 2780.00    0.18838
- 2790.00    0.19036
- 2800.00    0.19234
- 2810.00    0.19411
- 2820.00    0.19589
- 2830.00    0.19767
- 2840.00    0.19945
- 2850.00    0.20123
- 2860.00    0.20239
- 2870.00    0.20387
- 2880.00    0.20558
- 2890.00    0.20729
- 2900.00    0.20902
- 2910.00    0.20996
- 2920.00    0.21091
- 2930.00    0.21185
- 2940.00    0.21280
- 2950.00    0.21375
- 2960.00    0.21448
- 2970.00    0.21522
- 2980.00    0.21595
- 2990.00    0.21669
- 3000.00    0.21742
- 3010.00    0.21808
- 3020.00    0.21874
- 3030.00    0.21940
- 3040.00    0.22006
- 3050.00    0.22071
- 3060.00    0.22137
- 3070.00    0.22203
- 3080.00    0.22268
- 3090.00    0.22334
- 3100.00    0.22400
- 3110.00    0.22473
- 3120.00    0.22546
- 3130.00    0.22619
- 3140.00    0.22692
- 3150.00    0.22765
- 3160.00    0.22823
- 3170.00    0.22880
- 3180.00    0.22938
- 3190.00    0.22995
- 3200.00    0.17289
- 3210.00    0.11543
- 3220.00    0.05780
+ 2500.00    0.00000
+ 2510.00    0.02890
+ 2520.00    0.07842
+ 2530.00    0.13705
+ 2540.00    0.16934
+ 2550.00    0.17568
+ 2560.00    0.18201
+ 2570.00    0.17908
+ 2580.00    0.17612
+ 2590.00    0.17743
+ 2600.00    0.17874
+ 2610.00    0.18320
+ 2620.00    0.18767
+ 2630.00    0.18694
+ 2640.00    0.18622
+ 2650.00    0.18415
+ 2660.00    0.18222
+ 2670.00    0.17916
+ 2680.00    0.17609
+ 2690.00    0.17934
+ 2700.00    0.18261
+ 2710.00    0.17972
+ 2720.00    0.17677
+ 2730.00    0.17248
+ 2740.00    0.16810
+ 2750.00    0.17060
+ 2760.00    0.17365
+ 2770.00    0.17828
+ 2780.00    0.18296
+ 2790.00    0.18927
+ 2800.00    0.19566
+ 2810.00    0.20374
+ 2820.00    0.21194
+ 2830.00    0.21147
+ 2840.00    0.21098
+ 2850.00    0.21570
+ 2860.00    0.21978
+ 2870.00    0.22200
+ 2880.00    0.22424
+ 2890.00    0.22634
+ 2900.00    0.22844
+ 2910.00    0.22980
+ 2920.00    0.23116
+ 2930.00    0.22575
+ 2940.00    0.22034
+ 2950.00    0.21453
+ 2960.00    0.20850
+ 2970.00    0.20439
+ 2980.00    0.20027
+ 2990.00    0.20086
+ 3000.00    0.20144
+ 3010.00    0.20298
+ 3020.00    0.20452
+ 3030.00    0.21077
+ 3040.00    0.21701
+ 3050.00    0.21982
+ 3060.00    0.22262
+ 3070.00    0.22042
+ 3080.00    0.21822
+ 3090.00    0.22159
+ 3100.00    0.22495
+ 3110.00    0.22649
+ 3120.00    0.22802
+ 3130.00    0.22460
+ 3140.00    0.22117
+ 3150.00    0.21898
+ 3160.00    0.21664
+ 3170.00    0.22178
+ 3180.00    0.22692
+ 3190.00    0.22901
+ 3200.00    0.17332
+ 3210.00    0.11541
+ 3220.00    0.05763
  3230.00    0.00000
  3240.00    0.00000
  3250.00    0.00000

ObservationSim/Instrument/data/throughputs/r_throughput.txt

-# r_css
+# r_cssc
+# lambda_Angst  throughput
  2000.00    0.00000
  2010.00    0.00000
  2020.00    0.00000
@@ -311,12 +312,12 @@
  5090.00    0.00000
  5100.00    0.00000
  5110.00    0.00000
- 5120.00    0.00000
- 5130.00    0.00000
- 5140.00    0.00000
- 5150.00    0.00000
- 5160.00    0.00000
- 5170.00    0.00000
+ 5120.00    0.00001
+ 5130.00    0.00001
+ 5140.00    0.00001
+ 5150.00    0.00001
+ 5160.00    0.00001
+ 5170.00    0.00001
  5180.00    0.00000
  5190.00    0.00000
  5200.00    0.00000
@@ -329,228 +330,228 @@
  5270.00    0.00000
  5280.00    0.00000
  5290.00    0.00000
- 5300.00    0.00000
- 5310.00    0.00000
- 5320.00    0.00000
- 5330.00    0.00000
- 5340.00    0.00000
- 5350.00    0.00000
- 5360.00    0.00000
- 5370.00    0.00000
- 5380.00    0.00000
- 5390.00    0.00000
- 5400.00    0.00000
- 5410.00    0.00000
- 5420.00    0.00000
- 5430.00    0.00000
- 5440.00    0.00000
- 5450.00    0.00000
- 5460.00    0.00000
- 5470.00    0.11125
- 5480.00    0.22258
- 5490.00    0.33397
- 5500.00    0.44544
- 5510.00    0.55704
- 5520.00    0.66874
- 5530.00    0.66902
- 5540.00    0.66931
- 5550.00    0.66960
- 5560.00    0.66989
- 5570.00    0.67018
- 5580.00    0.67046
- 5590.00    0.67075
- 5600.00    0.67104
- 5610.00    0.67104
- 5620.00    0.67104
- 5630.00    0.67104
- 5640.00    0.67104
- 5650.00    0.67104
- 5660.00    0.67104
- 5670.00    0.67104
- 5680.00    0.67104
- 5690.00    0.67104
- 5700.00    0.67104
- 5710.00    0.67104
- 5720.00    0.67104
- 5730.00    0.67104
- 5740.00    0.67104
- 5750.00    0.67104
- 5760.00    0.67104
- 5770.00    0.67104
- 5780.00    0.67104
- 5790.00    0.67104
- 5800.00    0.67104
- 5810.00    0.67104
- 5820.00    0.67104
- 5830.00    0.67104
- 5840.00    0.67104
- 5850.00    0.67104
- 5860.00    0.67104
- 5870.00    0.67104
- 5880.00    0.67104
- 5890.00    0.67104
- 5900.00    0.67104
- 5910.00    0.67082
- 5920.00    0.67061
- 5930.00    0.67039
- 5940.00    0.67018
- 5950.00    0.66996
- 5960.00    0.66974
- 5970.00    0.66953
- 5980.00    0.66931
- 5990.00    0.66910
- 6000.00    0.66888
- 6010.00    0.66852
- 6020.00    0.66816
- 6030.00    0.66780
- 6040.00    0.66744
- 6050.00    0.66708
- 6060.00    0.66672
- 6070.00    0.66636
- 6080.00    0.66600
- 6090.00    0.66564
- 6100.00    0.66528
- 6110.00    0.66506
- 6120.00    0.66485
- 6130.00    0.66463
- 6140.00    0.66442
- 6150.00    0.66420
- 6160.00    0.66398
- 6170.00    0.66377
- 6180.00    0.66355
- 6190.00    0.66334
- 6200.00    0.66312
- 6210.00    0.66290
- 6220.00    0.66269
- 6230.00    0.66247
- 6240.00    0.66226
- 6250.00    0.66204
- 6260.00    0.66182
- 6270.00    0.66161
- 6280.00    0.66139
- 6290.00    0.66118
- 6300.00    0.66096
- 6310.00    0.66067
- 6320.00    0.66038
- 6330.00    0.66010
- 6340.00    0.65981
- 6350.00    0.65952
- 6360.00    0.65923
- 6370.00    0.65894
- 6380.00    0.65866
- 6390.00    0.65837
- 6400.00    0.65808
- 6410.00    0.65758
- 6420.00    0.65707
- 6430.00    0.65657
- 6440.00    0.65606
- 6450.00    0.65556
- 6460.00    0.65506
- 6470.00    0.65455
- 6480.00    0.65405
- 6490.00    0.65354
- 6500.00    0.65304
- 6510.00    0.65225
- 6520.00    0.65146
- 6530.00    0.65066
- 6540.00    0.64987
- 6550.00    0.64908
- 6560.00    0.64829
- 6570.00    0.64750
- 6580.00    0.64670
- 6590.00    0.64591
- 6600.00    0.64512
- 6610.00    0.64433
- 6620.00    0.64354
- 6630.00    0.64274
- 6640.00    0.64195
- 6650.00    0.64116
- 6660.00    0.64037
- 6670.00    0.63958
- 6680.00    0.63878
- 6690.00    0.63799
- 6700.00    0.63720
- 6710.00    0.63670
- 6720.00    0.63619
- 6730.00    0.63569
- 6740.00    0.63518
- 6750.00    0.63468
- 6760.00    0.63418
- 6770.00    0.63367
- 6780.00    0.63317
- 6790.00    0.63266
- 6800.00    0.63216
- 6810.00    0.63115
- 6820.00    0.63014
- 6830.00    0.62914
- 6840.00    0.62813
- 6850.00    0.62712
- 6860.00    0.62611
- 6870.00    0.62510
- 6880.00    0.57952
- 6890.00    0.48957
- 6900.00    0.39991
- 6910.00    0.31057
- 6920.00    0.22150
- 6930.00    0.13270
- 6940.00    0.04417
- 6950.00    0.00000
- 6960.00    0.00000
- 6970.00    0.00000
- 6980.00    0.00000
- 6990.00    0.00000
- 7000.00    0.00000
- 7010.00    0.00000
- 7020.00    0.00000
- 7030.00    0.00000
- 7040.00    0.00000
- 7050.00    0.00000
- 7060.00    0.00000
- 7070.00    0.00000
- 7080.00    0.00000
- 7090.00    0.00000
- 7100.00    0.00000
- 7110.00    0.00000
- 7120.00    0.00000
- 7130.00    0.00000
- 7140.00    0.00000
- 7150.00    0.00000
- 7160.00    0.00000
- 7170.00    0.00000
- 7180.00    0.00000
- 7190.00    0.00000
- 7200.00    0.00000
- 7210.00    0.00000
- 7220.00    0.00000
- 7230.00    0.00000
- 7240.00    0.00000
- 7250.00    0.00000
- 7260.00    0.00000
- 7270.00    0.00000
- 7280.00    0.00000
- 7290.00    0.00000
- 7300.00    0.00000
- 7310.00    0.00000
- 7320.00    0.00000
- 7330.00    0.00000
- 7340.00    0.00000
- 7350.00    0.00000
- 7360.00    0.00000
- 7370.00    0.00000
- 7380.00    0.00000
- 7390.00    0.00000
- 7400.00    0.00000
- 7410.00    0.00000
- 7420.00    0.00000
- 7430.00    0.00000
- 7440.00    0.00000
- 7450.00    0.00000
- 7460.00    0.00000
- 7470.00    0.00000
- 7480.00    0.00000
- 7490.00    0.00000
- 7500.00    0.00000
- 7510.00    0.00000
+ 5300.00    0.00001
+ 5310.00    0.00001
+ 5320.00    0.00001
+ 5330.00    0.00002
+ 5340.00    0.00003
+ 5350.00    0.00005
+ 5360.00    0.00009
+ 5370.00    0.00016
+ 5380.00    0.00031
+ 5390.00    0.00066
+ 5400.00    0.00150
+ 5410.00    0.00395
+ 5420.00    0.01166
+ 5430.00    0.03307
+ 5440.00    0.07854
+ 5450.00    0.14926
+ 5460.00    0.23899
+ 5470.00    0.33256
+ 5480.00    0.41052
+ 5490.00    0.46942
+ 5500.00    0.51316
+ 5510.00    0.54712
+ 5520.00    0.57754
+ 5530.00    0.60334
+ 5540.00    0.62365
+ 5550.00    0.63930
+ 5560.00    0.64902
+ 5570.00    0.65482
+ 5580.00    0.65288
+ 5590.00    0.64276
+ 5600.00    0.62930
+ 5610.00    0.61532
+ 5620.00    0.60637
+ 5630.00    0.60599
+ 5640.00    0.61270
+ 5650.00    0.62476
+ 5660.00    0.63883
+ 5670.00    0.65060
+ 5680.00    0.65817
+ 5690.00    0.66197
+ 5700.00    0.66176
+ 5710.00    0.65954
+ 5720.00    0.65814
+ 5730.00    0.66021
+ 5740.00    0.66449
+ 5750.00    0.66846
+ 5760.00    0.67119
+ 5770.00    0.67199
+ 5780.00    0.66919
+ 5790.00    0.66394
+ 5800.00    0.65767
+ 5810.00    0.65139
+ 5820.00    0.64820
+ 5830.00    0.65106
+ 5840.00    0.65767
+ 5850.00    0.66682
+ 5860.00    0.67617
+ 5870.00    0.68388
+ 5880.00    0.68869
+ 5890.00    0.68975
+ 5900.00    0.68857
+ 5910.00    0.68569
+ 5920.00    0.68383
+ 5930.00    0.68380
+ 5940.00    0.68630
+ 5950.00    0.69038
+ 5960.00    0.69529
+ 5970.00    0.70020
+ 5980.00    0.70338
+ 5990.00    0.70456
+ 6000.00    0.70354
+ 6010.00    0.70066
+ 6020.00    0.69712
+ 6030.00    0.69494
+ 6040.00    0.69399
+ 6050.00    0.69320
+ 6060.00    0.69388
+ 6070.00    0.69624
+ 6080.00    0.69898
+ 6090.00    0.70077
+ 6100.00    0.70221
+ 6110.00    0.70386
+ 6120.00    0.70518
+ 6130.00    0.70747
+ 6140.00    0.70999
+ 6150.00    0.71149
+ 6160.00    0.71301
+ 6170.00    0.71518
+ 6180.00    0.71703
+ 6190.00    0.71840
+ 6200.00    0.71953
+ 6210.00    0.72052
+ 6220.00    0.72152
+ 6230.00    0.72192
+ 6240.00    0.72250
+ 6250.00    0.72269
+ 6260.00    0.72254
+ 6270.00    0.72336
+ 6280.00    0.72378
+ 6290.00    0.72403
+ 6300.00    0.72409
+ 6310.00    0.72262
+ 6320.00    0.72125
+ 6330.00    0.72066
+ 6340.00    0.72042
+ 6350.00    0.72120
+ 6360.00    0.72182
+ 6370.00    0.72298
+ 6380.00    0.72341
+ 6390.00    0.71960
+ 6400.00    0.71461
+ 6410.00    0.71000
+ 6420.00    0.70473
+ 6430.00    0.69886
+ 6440.00    0.69369
+ 6450.00    0.68920
+ 6460.00    0.68565
+ 6470.00    0.68573
+ 6480.00    0.68694
+ 6490.00    0.68660
+ 6500.00    0.68667
+ 6510.00    0.68760
+ 6520.00    0.68845
+ 6530.00    0.68866
+ 6540.00    0.68844
+ 6550.00    0.68662
+ 6560.00    0.68462
+ 6570.00    0.68347
+ 6580.00    0.68216
+ 6590.00    0.68049
+ 6600.00    0.67869
+ 6610.00    0.67935
+ 6620.00    0.67989
+ 6630.00    0.67634
+ 6640.00    0.67264
+ 6650.00    0.67151
+ 6660.00    0.67007
+ 6670.00    0.66786
+ 6680.00    0.66532
+ 6690.00    0.66222
+ 6700.00    0.65913
+ 6710.00    0.65660
+ 6720.00    0.65451
+ 6730.00    0.65243
+ 6740.00    0.65085
+ 6750.00    0.65020
+ 6760.00    0.65004
+ 6770.00    0.65077
+ 6780.00    0.65145
+ 6790.00    0.65186
+ 6800.00    0.65081
+ 6810.00    0.64842
+ 6820.00    0.64393
+ 6830.00    0.63715
+ 6840.00    0.62891
+ 6850.00    0.61936
+ 6860.00    0.61129
+ 6870.00    0.60651
+ 6880.00    0.60553
+ 6890.00    0.60666
+ 6900.00    0.60476
+ 6910.00    0.59163
+ 6920.00    0.55628
+ 6930.00    0.49411
+ 6940.00    0.40862
+ 6950.00    0.30991
+ 6960.00    0.21906
+ 6970.00    0.14420
+ 6980.00    0.09015
+ 6990.00    0.05548
+ 7000.00    0.03389
+ 7010.00    0.02119
+ 7020.00    0.01362
+ 7030.00    0.00897
+ 7040.00    0.00608
+ 7050.00    0.00421
+ 7060.00    0.00296
+ 7070.00    0.00216
+ 7080.00    0.00158
+ 7090.00    0.00118
+ 7100.00    0.00089
+ 7110.00    0.00068
+ 7120.00    0.00053
+ 7130.00    0.00042
+ 7140.00    0.00033
+ 7150.00    0.00026
+ 7160.00    0.00021
+ 7170.00    0.00017
+ 7180.00    0.00014
+ 7190.00    0.00012
+ 7200.00    0.00010
+ 7210.00    0.00008
+ 7220.00    0.00007
+ 7230.00    0.00006
+ 7240.00    0.00005
+ 7250.00    0.00004
+ 7260.00    0.00004
+ 7270.00    0.00003
+ 7280.00    0.00003
+ 7290.00    0.00003
+ 7300.00    0.00002
+ 7310.00    0.00002
+ 7320.00    0.00002
+ 7330.00    0.00002
+ 7340.00    0.00001
+ 7350.00    0.00001
+ 7360.00    0.00001
+ 7370.00    0.00001
+ 7380.00    0.00001
+ 7390.00    0.00001
+ 7400.00    0.00001
+ 7410.00    0.00001
+ 7420.00    0.00001
+ 7430.00    0.00001
+ 7440.00    0.00001
+ 7450.00    0.00001
+ 7460.00    0.00001
+ 7470.00    0.00001
+ 7480.00    0.00001
+ 7490.00    0.00001
+ 7500.00    0.00001
+ 7510.00    0.00001
  7520.00    0.00000
  7530.00    0.00000
  7540.00    0.00000
@@ -599,65 +600,65 @@
  7970.00    0.00000
  7980.00    0.00000
  7990.00    0.00000
- 8000.00    0.00000
- 8010.00    0.00000
- 8020.00    0.00000
- 8030.00    0.00000
- 8040.00    0.00000
- 8050.00    0.00000
- 8060.00    0.00000
+ 8000.00    0.00001
+ 8010.00    0.00001
+ 8020.00    0.00001
+ 8030.00    0.00001
+ 8040.00    0.00001
+ 8050.00    0.00001
+ 8060.00    0.00001
  8070.00    0.00000
  8080.00    0.00000
- 8090.00    0.00000
- 8100.00    0.00000
+ 8090.00    0.00001
+ 8100.00    0.00001
  8110.00    0.00000
- 8120.00    0.00000
- 8130.00    0.00000
- 8140.00    0.00000
+ 8120.00    0.00001
+ 8130.00    0.00001
+ 8140.00    0.00001
  8150.00    0.00000
  8160.00    0.00000
- 8170.00    0.00000
- 8180.00    0.00000
- 8190.00    0.00000
- 8200.00    0.00000
- 8210.00    0.00000
- 8220.00    0.00000
- 8230.00    0.00000
- 8240.00    0.00000
- 8250.00    0.00000
- 8260.00    0.00000
- 8270.00    0.00000
- 8280.00    0.00000
- 8290.00    0.00000
- 8300.00    0.00000
- 8310.00    0.00000
- 8320.00    0.00000
- 8330.00    0.00000
- 8340.00    0.00000
- 8350.00    0.00000
- 8360.00    0.00000
- 8370.00    0.00000
- 8380.00    0.00000
- 8390.00    0.00000
+ 8170.00    0.00001
+ 8180.00    0.00001
+ 8190.00    0.00001
+ 8200.00    0.00001
+ 8210.00    0.00001
+ 8220.00    0.00001
+ 8230.00    0.00001
+ 8240.00    0.00001
+ 8250.00    0.00001
+ 8260.00    0.00001
+ 8270.00    0.00002
+ 8280.00    0.00001
+ 8290.00    0.00001
+ 8300.00    0.00001
+ 8310.00    0.00001
+ 8320.00    0.00001
+ 8330.00    0.00001
+ 8340.00    0.00001
+ 8350.00    0.00001
+ 8360.00    0.00001
+ 8370.00    0.00001
+ 8380.00    0.00001
+ 8390.00    0.00001
  8400.00    0.00000
  8410.00    0.00000
- 8420.00    0.00000
- 8430.00    0.00000
- 8440.00    0.00000
- 8450.00    0.00000
+ 8420.00    0.00001
+ 8430.00    0.00001
+ 8440.00    0.00001
+ 8450.00    0.00001
  8460.00    0.00000
- 8470.00    0.00000
- 8480.00    0.00000
- 8490.00    0.00000
- 8500.00    0.00000
+ 8470.00    0.00001
+ 8480.00    0.00001
+ 8490.00    0.00001
+ 8500.00    0.00001
  8510.00    0.00000
- 8520.00    0.00000
+ 8520.00    0.00001
  8530.00    0.00000
  8540.00    0.00000
  8550.00    0.00000
  8560.00    0.00000
  8570.00    0.00000
- 8580.00    0.00000
+ 8580.00    0.00001
  8590.00    0.00000
  8600.00    0.00000
  8610.00    0.00000
@@ -665,17 +666,17 @@
  8630.00    0.00000
  8640.00    0.00000
  8650.00    0.00000
- 8660.00    0.00000
- 8670.00    0.00000
+ 8660.00    0.00001
+ 8670.00    0.00001
  8680.00    0.00000
  8690.00    0.00000
- 8700.00    0.00000
+ 8700.00    0.00001
  8710.00    0.00000
  8720.00    0.00000
- 8730.00    0.00000
+ 8730.00    0.00001
  8740.00    0.00000
  8750.00    0.00000
- 8760.00    0.00000
+ 8760.00    0.00001
  8770.00    0.00000
  8780.00    0.00000
  8790.00    0.00000

ObservationSim/Instrument/data/throughputs/u_throughput.txt

-# u_css
+# u_cssc
+# lambda_Angst  throughput
  2000.00    0.00000
  2010.00    0.00000
  2020.00    0.00000
@@ -106,124 +107,124 @@
  3040.00    0.00000
  3050.00    0.00000
  3060.00    0.00000
- 3070.00    0.00000
- 3080.00    0.00000
- 3090.00    0.00000
- 3100.00    0.00000
- 3110.00    0.00000
- 3120.00    0.00000
- 3130.00    0.00000
- 3140.00    0.00000
- 3150.00    0.00000
- 3160.00    0.00000
- 3170.00    0.00000
- 3180.00    0.06881
- 3190.00    0.13797
- 3200.00    0.20747
- 3210.00    0.27703
- 3220.00    0.27743
- 3230.00    0.27782
- 3240.00    0.27822
- 3250.00    0.27861
- 3260.00    0.27909
- 3270.00    0.27957
- 3280.00    0.28005
- 3290.00    0.28052
- 3300.00    0.28100
- 3310.00    0.28137
- 3320.00    0.28174
- 3330.00    0.28211
- 3340.00    0.28247
- 3350.00    0.28283
- 3360.00    0.28309
- 3370.00    0.28335
- 3380.00    0.28360
- 3390.00    0.28385
- 3400.00    0.28410
- 3410.00    0.28424
- 3420.00    0.28437
- 3430.00    0.28451
- 3440.00    0.28464
- 3450.00    0.28476
- 3460.00    0.28488
- 3470.00    0.28500
- 3480.00    0.28511
- 3490.00    0.28522
- 3500.00    0.28532
- 3510.00    0.28552
- 3520.00    0.28572
- 3530.00    0.28592
- 3540.00    0.28611
- 3550.00    0.28630
- 3560.00    0.28659
- 3570.00    0.28688
- 3580.00    0.28716
- 3590.00    0.28744
- 3600.00    0.28761
- 3610.00    0.28688
- 3620.00    0.28615
- 3630.00    0.28541
- 3640.00    0.28467
- 3650.00    0.28393
- 3660.00    0.28382
- 3670.00    0.28372
- 3680.00    0.28361
- 3690.00    0.28350
- 3700.00    0.28339
- 3710.00    0.28468
- 3720.00    0.28598
- 3730.00    0.28727
- 3740.00    0.28857
- 3750.00    0.28987
- 3760.00    0.29161
- 3770.00    0.29335
- 3780.00    0.29510
- 3790.00    0.29685
- 3800.00    0.29860
- 3810.00    0.29981
- 3820.00    0.30103
- 3830.00    0.30224
- 3840.00    0.30346
- 3850.00    0.30468
- 3860.00    0.30590
- 3870.00    0.30712
- 3880.00    0.30835
- 3890.00    0.30958
- 3900.00    0.31081
- 3910.00    0.31316
- 3920.00    0.31551
- 3930.00    0.31786
- 3940.00    0.32022
- 3950.00    0.32259
- 3960.00    0.32485
- 3970.00    0.32712
- 3980.00    0.32939
- 3990.00    0.33166
- 4000.00    0.33394
- 4010.00    0.33601
- 4020.00    0.33807
- 4030.00    0.34014
- 4040.00    0.30799
- 4050.00    0.24101
- 4060.00    0.17296
- 4070.00    0.10427
- 4080.00    0.03492
- 4090.00    0.00000
- 4100.00    0.00000
- 4110.00    0.00000
- 4120.00    0.00000
- 4130.00    0.00000
- 4140.00    0.00000
- 4150.00    0.00000
- 4160.00    0.00000
- 4170.00    0.00000
- 4180.00    0.00000
- 4190.00    0.00000
- 4200.00    0.00000
- 4210.00    0.00000
- 4220.00    0.00000
- 4230.00    0.00000
- 4240.00    0.00000
+ 3070.00    0.00001
+ 3080.00    0.00001
+ 3090.00    0.00003
+ 3100.00    0.00007
+ 3110.00    0.00014
+ 3120.00    0.00028
+ 3130.00    0.00056
+ 3140.00    0.00110
+ 3150.00    0.00223
+ 3160.00    0.00472
+ 3170.00    0.01042
+ 3180.00    0.02190
+ 3190.00    0.04190
+ 3200.00    0.08056
+ 3210.00    0.12185
+ 3220.00    0.16669
+ 3230.00    0.20778
+ 3240.00    0.23999
+ 3250.00    0.26389
+ 3260.00    0.27898
+ 3270.00    0.29519
+ 3280.00    0.30854
+ 3290.00    0.32894
+ 3300.00    0.34872
+ 3310.00    0.35846
+ 3320.00    0.36782
+ 3330.00    0.36385
+ 3340.00    0.36002
+ 3350.00    0.35646
+ 3360.00    0.35286
+ 3370.00    0.35634
+ 3380.00    0.36011
+ 3390.00    0.36259
+ 3400.00    0.36459
+ 3410.00    0.36476
+ 3420.00    0.36386
+ 3430.00    0.35734
+ 3440.00    0.35107
+ 3450.00    0.34668
+ 3460.00    0.34357
+ 3470.00    0.34944
+ 3480.00    0.35524
+ 3490.00    0.35529
+ 3500.00    0.35436
+ 3510.00    0.35182
+ 3520.00    0.34861
+ 3530.00    0.34490
+ 3540.00    0.34165
+ 3550.00    0.34203
+ 3560.00    0.34307
+ 3570.00    0.34341
+ 3580.00    0.34401
+ 3590.00    0.34655
+ 3600.00    0.34841
+ 3610.00    0.35149
+ 3620.00    0.35432
+ 3630.00    0.35415
+ 3640.00    0.35463
+ 3650.00    0.35643
+ 3660.00    0.35858
+ 3670.00    0.36209
+ 3680.00    0.36554
+ 3690.00    0.36682
+ 3700.00    0.36791
+ 3710.00    0.36581
+ 3720.00    0.36333
+ 3730.00    0.36299
+ 3740.00    0.36246
+ 3750.00    0.36867
+ 3760.00    0.37511
+ 3770.00    0.38015
+ 3780.00    0.38586
+ 3790.00    0.38633
+ 3800.00    0.38714
+ 3810.00    0.38734
+ 3820.00    0.38673
+ 3830.00    0.38847
+ 3840.00    0.39011
+ 3850.00    0.39062
+ 3860.00    0.39202
+ 3870.00    0.39367
+ 3880.00    0.39491
+ 3890.00    0.39554
+ 3900.00    0.39594
+ 3910.00    0.39508
+ 3920.00    0.39452
+ 3930.00    0.39304
+ 3940.00    0.38925
+ 3950.00    0.38325
+ 3960.00    0.36781
+ 3970.00    0.33940
+ 3980.00    0.29857
+ 3990.00    0.24542
+ 4000.00    0.18812
+ 4010.00    0.13345
+ 4020.00    0.08722
+ 4030.00    0.05312
+ 4040.00    0.03033
+ 4050.00    0.01673
+ 4060.00    0.00939
+ 4070.00    0.00539
+ 4080.00    0.00315
+ 4090.00    0.00188
+ 4100.00    0.00115
+ 4110.00    0.00074
+ 4120.00    0.00049
+ 4130.00    0.00033
+ 4140.00    0.00023
+ 4150.00    0.00016
+ 4160.00    0.00011
+ 4170.00    0.00008
+ 4180.00    0.00005
+ 4190.00    0.00004
+ 4200.00    0.00002
+ 4210.00    0.00002
+ 4220.00    0.00001
+ 4230.00    0.00001
+ 4240.00    0.00001
  4250.00    0.00000
  4260.00    0.00000
  4270.00    0.00000
@@ -543,23 +544,23 @@
  7410.00    0.00000
  7420.00    0.00000
  7430.00    0.00000
- 7440.00    0.00000
- 7450.00    0.00000
- 7460.00    0.00000
- 7470.00    0.00000
- 7480.00    0.00000
- 7490.00    0.00000
- 7500.00    0.00000
- 7510.00    0.00000
- 7520.00    0.00000
- 7530.00    0.00000
- 7540.00    0.00000
- 7550.00    0.00000
- 7560.00    0.00000
- 7570.00    0.00000
- 7580.00    0.00000
- 7590.00    0.00000
- 7600.00    0.00000
+ 7440.00    0.00001
+ 7450.00    0.00001
+ 7460.00    0.00001
+ 7470.00    0.00001
+ 7480.00    0.00001
+ 7490.00    0.00001
+ 7500.00    0.00001
+ 7510.00    0.00001
+ 7520.00    0.00001
+ 7530.00    0.00001
+ 7540.00    0.00002
+ 7550.00    0.00002
+ 7560.00    0.00001
+ 7570.00    0.00001
+ 7580.00    0.00001
+ 7590.00    0.00001
+ 7600.00    0.00001
  7610.00    0.00000
  7620.00    0.00000
  7630.00    0.00000
@@ -575,19 +576,19 @@
  7730.00    0.00000
  7740.00    0.00000
  7750.00    0.00000
- 7760.00    0.00000
- 7770.00    0.00000
- 7780.00    0.00000
- 7790.00    0.00000
- 7800.00    0.00000
- 7810.00    0.00000
- 7820.00    0.00000
- 7830.00    0.00000
- 7840.00    0.00000
- 7850.00    0.00000
- 7860.00    0.00000
- 7870.00    0.00000
- 7880.00    0.00000
+ 7760.00    0.00001
+ 7770.00    0.00001
+ 7780.00    0.00002
+ 7790.00    0.00004
+ 7800.00    0.00007
+ 7810.00    0.00010
+ 7820.00    0.00010
+ 7830.00    0.00009
+ 7840.00    0.00006
+ 7850.00    0.00003
+ 7860.00    0.00001
+ 7870.00    0.00001
+ 7880.00    0.00001
  7890.00    0.00000
  7900.00    0.00000
  7910.00    0.00000
@@ -599,140 +600,140 @@
  7970.00    0.00000
  7980.00    0.00000
  7990.00    0.00000
- 8000.00    0.00000
- 8010.00    0.00000
- 8020.00    0.00000
- 8030.00    0.00000
- 8040.00    0.00000
- 8050.00    0.00000
- 8060.00    0.00000
- 8070.00    0.00000
- 8080.00    0.00000
- 8090.00    0.00000
- 8100.00    0.00000
- 8110.00    0.00000
- 8120.00    0.00000
- 8130.00    0.00000
- 8140.00    0.00000
- 8150.00    0.00000
- 8160.00    0.00000
- 8170.00    0.00000
- 8180.00    0.00000
- 8190.00    0.00000
- 8200.00    0.00000
- 8210.00    0.00000
- 8220.00    0.00000
- 8230.00    0.00000
- 8240.00    0.00000
- 8250.00    0.00000
- 8260.00    0.00000
- 8270.00    0.00000
- 8280.00    0.00000
- 8290.00    0.00000
- 8300.00    0.00000
- 8310.00    0.00000
- 8320.00    0.00000
- 8330.00    0.00000
- 8340.00    0.00000
- 8350.00    0.00000
- 8360.00    0.00000
- 8370.00    0.00000
- 8380.00    0.00000
- 8390.00    0.00000
- 8400.00    0.00000
- 8410.00    0.00000
- 8420.00    0.00000
- 8430.00    0.00000
- 8440.00    0.00000
- 8450.00    0.00000
- 8460.00    0.00000
- 8470.00    0.00000
- 8480.00    0.00000
- 8490.00    0.00000
- 8500.00    0.00000
- 8510.00    0.00000
- 8520.00    0.00000
- 8530.00    0.00000
- 8540.00    0.00000
- 8550.00    0.00000
- 8560.00    0.00000
- 8570.00    0.00000
- 8580.00    0.00000
- 8590.00    0.00000
- 8600.00    0.00000
- 8610.00    0.00000
- 8620.00    0.00000
- 8630.00    0.00000
- 8640.00    0.00000
- 8650.00    0.00000
- 8660.00    0.00000
- 8670.00    0.00000
- 8680.00    0.00000
- 8690.00    0.00000
- 8700.00    0.00000
- 8710.00    0.00000
- 8720.00    0.00000
- 8730.00    0.00000
- 8740.00    0.00000
- 8750.00    0.00000
- 8760.00    0.00000
- 8770.00    0.00000
- 8780.00    0.00000
- 8790.00    0.00000
- 8800.00    0.00000
- 8810.00    0.00000
- 8820.00    0.00000
- 8830.00    0.00000
- 8840.00    0.00000
- 8850.00    0.00000
- 8860.00    0.00000
- 8870.00    0.00000
- 8880.00    0.00000
- 8890.00    0.00000
- 8900.00    0.00000
- 8910.00    0.00000
- 8920.00    0.00000
- 8930.00    0.00000
- 8940.00    0.00000
- 8950.00    0.00000
- 8960.00    0.00000
- 8970.00    0.00000
- 8980.00    0.00000
- 8990.00    0.00000
- 9000.00    0.00000
- 9010.00    0.00000
- 9020.00    0.00000
- 9030.00    0.00000
- 9040.00    0.00000
- 9050.00    0.00000
- 9060.00    0.00000
- 9070.00    0.00000
- 9080.00    0.00000
- 9090.00    0.00000
- 9100.00    0.00000
- 9110.00    0.00000
- 9120.00    0.00000
- 9130.00    0.00000
- 9140.00    0.00000
- 9150.00    0.00000
- 9160.00    0.00000
- 9170.00    0.00000
- 9180.00    0.00000
- 9190.00    0.00000
- 9200.00    0.00000
- 9210.00    0.00000
- 9220.00    0.00000
- 9230.00    0.00000
- 9240.00    0.00000
- 9250.00    0.00000
- 9260.00    0.00000
- 9270.00    0.00000
- 9280.00    0.00000
- 9290.00    0.00000
- 9300.00    0.00000
- 9310.00    0.00000
- 9320.00    0.00000
- 9330.00    0.00000
+ 8000.00    0.00003
+ 8010.00    0.00003
+ 8020.00    0.00003
+ 8030.00    0.00003
+ 8040.00    0.00002
+ 8050.00    0.00003
+ 8060.00    0.00003
+ 8070.00    0.00003
+ 8080.00    0.00003
+ 8090.00    0.00002
+ 8100.00    0.00003
+ 8110.00    0.00002
+ 8120.00    0.00002
+ 8130.00    0.00002
+ 8140.00    0.00003
+ 8150.00    0.00003
+ 8160.00    0.00002
+ 8170.00    0.00002
+ 8180.00    0.00002
+ 8190.00    0.00002
+ 8200.00    0.00002
+ 8210.00    0.00002
+ 8220.00    0.00002
+ 8230.00    0.00002
+ 8240.00    0.00002
+ 8250.00    0.00002
+ 8260.00    0.00002
+ 8270.00    0.00002
+ 8280.00    0.00002
+ 8290.00    0.00002
+ 8300.00    0.00002
+ 8310.00    0.00002
+ 8320.00    0.00002
+ 8330.00    0.00002
+ 8340.00    0.00002
+ 8350.00    0.00002
+ 8360.00    0.00002
+ 8370.00    0.00002
+ 8380.00    0.00002
+ 8390.00    0.00002
+ 8400.00    0.00002
+ 8410.00    0.00002
+ 8420.00    0.00002
+ 8430.00    0.00002
+ 8440.00    0.00002
+ 8450.00    0.00002
+ 8460.00    0.00002
+ 8470.00    0.00002
+ 8480.00    0.00002
+ 8490.00    0.00003
+ 8500.00    0.00003
+ 8510.00    0.00003
+ 8520.00    0.00003
+ 8530.00    0.00003
+ 8540.00    0.00003
+ 8550.00    0.00003
+ 8560.00    0.00003
+ 8570.00    0.00003
+ 8580.00    0.00003
+ 8590.00    0.00003
+ 8600.00    0.00003
+ 8610.00    0.00003
+ 8620.00    0.00003
+ 8630.00    0.00004
+ 8640.00    0.00003
+ 8650.00    0.00003
+ 8660.00    0.00003
+ 8670.00    0.00003
+ 8680.00    0.00003
+ 8690.00    0.00003
+ 8700.00    0.00003
+ 8710.00    0.00003
+ 8720.00    0.00003
+ 8730.00    0.00002
+ 8740.00    0.00002
+ 8750.00    0.00003
+ 8760.00    0.00002
+ 8770.00    0.00002
+ 8780.00    0.00002
+ 8790.00    0.00002
+ 8800.00    0.00002
+ 8810.00    0.00002
+ 8820.00    0.00002
+ 8830.00    0.00002
+ 8840.00    0.00002
+ 8850.00    0.00002
+ 8860.00    0.00002
+ 8870.00    0.00002
+ 8880.00    0.00002
+ 8890.00    0.00002
+ 8900.00    0.00002
+ 8910.00    0.00002
+ 8920.00    0.00002
+ 8930.00    0.00002
+ 8940.00    0.00002
+ 8950.00    0.00002
+ 8960.00    0.00002
+ 8970.00    0.00003
+ 8980.00    0.00003
+ 8990.00    0.00003
+ 9000.00    0.00003
+ 9010.00    0.00003
+ 9020.00    0.00003
+ 9030.00    0.00003
+ 9040.00    0.00003
+ 9050.00    0.00003
+ 9060.00    0.00003
+ 9070.00    0.00003
+ 9080.00    0.00003
+ 9090.00    0.00003
+ 9100.00    0.00003
+ 9110.00    0.00003
+ 9120.00    0.00002
+ 9130.00    0.00002
+ 9140.00    0.00002
+ 9150.00    0.00002
+ 9160.00    0.00002
+ 9170.00    0.00002
+ 9180.00    0.00002
+ 9190.00    0.00002
+ 9200.00    0.00001
+ 9210.00    0.00001
+ 9220.00    0.00001
+ 9230.00    0.00001
+ 9240.00    0.00001
+ 9250.00    0.00001
+ 9260.00    0.00001
+ 9270.00    0.00001
+ 9280.00    0.00001
+ 9290.00    0.00001
+ 9300.00    0.00001
+ 9310.00    0.00001
+ 9320.00    0.00001
+ 9330.00    0.00001
  9340.00    0.00000
  9350.00    0.00000
  9360.00    0.00000

ObservationSim/Instrument/data/throughputs/y_throughput.txt

-# y_css
+# y_cssc
+# lambda_Angst  throughput
  2000.00    0.00000
  2010.00    0.00000
  2020.00    0.00000
@@ -271,19 +272,19 @@
  4690.00    0.00000
  4700.00    0.00000
  4710.00    0.00000
- 4720.00    0.00000
- 4730.00    0.00000
- 4740.00    0.00000
- 4750.00    0.00000
- 4760.00    0.00000
- 4770.00    0.00000
- 4780.00    0.00000
- 4790.00    0.00000
- 4800.00    0.00000
- 4810.00    0.00000
- 4820.00    0.00000
- 4830.00    0.00000
- 4840.00    0.00000
+ 4720.00    0.00001
+ 4730.00    0.00001
+ 4740.00    0.00001
+ 4750.00    0.00001
+ 4760.00    0.00001
+ 4770.00    0.00001
+ 4780.00    0.00002
+ 4790.00    0.00002
+ 4800.00    0.00002
+ 4810.00    0.00002
+ 4820.00    0.00002
+ 4830.00    0.00001
+ 4840.00    0.00001
  4850.00    0.00000
  4860.00    0.00000
  4870.00    0.00000
@@ -312,12 +313,12 @@
  5100.00    0.00000
  5110.00    0.00000
  5120.00    0.00000
- 5130.00    0.00000
- 5140.00    0.00000
- 5150.00    0.00000
- 5160.00    0.00000
- 5170.00    0.00000
- 5180.00    0.00000
+ 5130.00    0.00001
+ 5140.00    0.00001
+ 5150.00    0.00001
+ 5160.00    0.00001
+ 5170.00    0.00001
+ 5180.00    0.00001
  5190.00    0.00000
  5200.00    0.00000
  5210.00    0.00000
@@ -345,19 +346,19 @@
  5430.00    0.00000
  5440.00    0.00000
  5450.00    0.00000
- 5460.00    0.00000
- 5470.00    0.00000
- 5480.00    0.00000
- 5490.00    0.00000
- 5500.00    0.00000
- 5510.00    0.00000
- 5520.00    0.00000
- 5530.00    0.00000
- 5540.00    0.00000
- 5550.00    0.00000
- 5560.00    0.00000
- 5570.00    0.00000
- 5580.00    0.00000
+ 5460.00    0.00001
+ 5470.00    0.00001
+ 5480.00    0.00001
+ 5490.00    0.00002
+ 5500.00    0.00003
+ 5510.00    0.00003
+ 5520.00    0.00003
+ 5530.00    0.00003
+ 5540.00    0.00003
+ 5550.00    0.00002
+ 5560.00    0.00001
+ 5570.00    0.00001
+ 5580.00    0.00001
  5590.00    0.00000
  5600.00    0.00000
  5610.00    0.00000
@@ -368,22 +369,22 @@
  5660.00    0.00000
  5670.00    0.00000
  5680.00    0.00000
- 5690.00    0.00000
- 5700.00    0.00000
- 5710.00    0.00000
- 5720.00    0.00000
- 5730.00    0.00000
- 5740.00    0.00000
- 5750.00    0.00000
- 5760.00    0.00000
- 5770.00    0.00000
- 5780.00    0.00000
- 5790.00    0.00000
- 5800.00    0.00000
- 5810.00    0.00000
- 5820.00    0.00000
- 5830.00    0.00000
- 5840.00    0.00000
+ 5690.00    0.00001
+ 5700.00    0.00001
+ 5710.00    0.00001
+ 5720.00    0.00001
+ 5730.00    0.00001
+ 5740.00    0.00001
+ 5750.00    0.00001
+ 5760.00    0.00001
+ 5770.00    0.00001
+ 5780.00    0.00001
+ 5790.00    0.00002
+ 5800.00    0.00002
+ 5810.00    0.00002
+ 5820.00    0.00002
+ 5830.00    0.00001
+ 5840.00    0.00001
  5850.00    0.00000
  5860.00    0.00000
  5870.00    0.00000
@@ -397,8 +398,8 @@
  5950.00    0.00000
  5960.00    0.00000
  5970.00    0.00000
- 5980.00    0.00000
- 5990.00    0.00000
+ 5980.00    0.00001
+ 5990.00    0.00001
  6000.00    0.00000
  6010.00    0.00000
  6020.00    0.00000
@@ -436,13 +437,13 @@
  6340.00    0.00000
  6350.00    0.00000
  6360.00    0.00000
- 6370.00    0.00000
- 6380.00    0.00000
- 6390.00    0.00000
- 6400.00    0.00000
- 6410.00    0.00000
- 6420.00    0.00000
- 6430.00    0.00000
+ 6370.00    0.00001
+ 6380.00    0.00001
+ 6390.00    0.00001
+ 6400.00    0.00001
+ 6410.00    0.00001
+ 6420.00    0.00001
+ 6430.00    0.00001
  6440.00    0.00000
  6450.00    0.00000
  6460.00    0.00000
@@ -452,16 +453,16 @@
  6500.00    0.00000
  6510.00    0.00000
  6520.00    0.00000
- 6530.00    0.00000
- 6540.00    0.00000
- 6550.00    0.00000
- 6560.00    0.00000
- 6570.00    0.00000
- 6580.00    0.00000
- 6590.00    0.00000
- 6600.00    0.00000
- 6610.00    0.00000
- 6620.00    0.00000
+ 6530.00    0.00001
+ 6540.00    0.00001
+ 6550.00    0.00001
+ 6560.00    0.00001
+ 6570.00    0.00001
+ 6580.00    0.00001
+ 6590.00    0.00001
+ 6600.00    0.00001
+ 6610.00    0.00001
+ 6620.00    0.00001
  6630.00    0.00000
  6640.00    0.00000
  6650.00    0.00000
@@ -582,11 +583,11 @@
  7800.00    0.00000
  7810.00    0.00000
  7820.00    0.00000
- 7830.00    0.00000
- 7840.00    0.00000
- 7850.00    0.00000
- 7860.00    0.00000
- 7870.00    0.00000
+ 7830.00    0.00001
+ 7840.00    0.00001
+ 7850.00    0.00001
+ 7860.00    0.00001
+ 7870.00    0.00001
  7880.00    0.00000
  7890.00    0.00000
  7900.00    0.00000
@@ -599,304 +600,304 @@
  7970.00    0.00000
  7980.00    0.00000
  7990.00    0.00000
- 8000.00    0.00000
- 8010.00    0.00000
- 8020.00    0.00000
- 8030.00    0.00000
- 8040.00    0.00000
- 8050.00    0.00000
- 8060.00    0.00000
- 8070.00    0.00000
- 8080.00    0.00000
- 8090.00    0.00000
- 8100.00    0.00000
- 8110.00    0.00000
+ 8000.00    0.00002
+ 8010.00    0.00001
+ 8020.00    0.00002
+ 8030.00    0.00002
+ 8040.00    0.00001
+ 8050.00    0.00002
+ 8060.00    0.00001
+ 8070.00    0.00002
+ 8080.00    0.00001
+ 8090.00    0.00001
+ 8100.00    0.00001
+ 8110.00    0.00001
  8120.00    0.00000
- 8130.00    0.00000
- 8140.00    0.00000
+ 8130.00    0.00002
+ 8140.00    0.00001
  8150.00    0.00000
- 8160.00    0.00000
- 8170.00    0.00000
- 8180.00    0.00000
- 8190.00    0.00000
- 8200.00    0.00000
- 8210.00    0.00000
- 8220.00    0.00000
- 8230.00    0.00000
- 8240.00    0.00000
- 8250.00    0.00000
- 8260.00    0.00000
- 8270.00    0.00000
- 8280.00    0.00000
- 8290.00    0.00000
- 8300.00    0.00000
- 8310.00    0.00000
- 8320.00    0.00000
- 8330.00    0.00000
- 8340.00    0.00000
- 8350.00    0.00000
- 8360.00    0.00000
- 8370.00    0.00000
- 8380.00    0.00000
- 8390.00    0.00000
- 8400.00    0.00000
- 8410.00    0.00000
- 8420.00    0.00000
- 8430.00    0.00000
- 8440.00    0.00000
- 8450.00    0.00000
- 8460.00    0.00000
- 8470.00    0.00000
- 8480.00    0.00000
+ 8160.00    0.00001
+ 8170.00    0.00001
+ 8180.00    0.00002
+ 8190.00    0.00003
+ 8200.00    0.00002
+ 8210.00    0.00002
+ 8220.00    0.00002
+ 8230.00    0.00002
+ 8240.00    0.00001
+ 8250.00    0.00001
+ 8260.00    0.00002
+ 8270.00    0.00001
+ 8280.00    0.00001
+ 8290.00    0.00002
+ 8300.00    0.00001
+ 8310.00    0.00002
+ 8320.00    0.00002
+ 8330.00    0.00002
+ 8340.00    0.00001
+ 8350.00    0.00002
+ 8360.00    0.00001
+ 8370.00    0.00002
+ 8380.00    0.00002
+ 8390.00    0.00001
+ 8400.00    0.00002
+ 8410.00    0.00002
+ 8420.00    0.00001
+ 8430.00    0.00001
+ 8440.00    0.00001
+ 8450.00    0.00001
+ 8460.00    0.00001
+ 8470.00    0.00001
+ 8480.00    0.00001
  8490.00    0.00000
- 8500.00    0.00000
- 8510.00    0.00000
- 8520.00    0.00000
- 8530.00    0.00000
- 8540.00    0.00000
- 8550.00    0.00000
- 8560.00    0.00000
- 8570.00    0.00000
- 8580.00    0.00000
- 8590.00    0.00000
- 8600.00    0.00000
- 8610.00    0.00000
- 8620.00    0.00000
- 8630.00    0.00000
- 8640.00    0.00000
- 8650.00    0.00000
- 8660.00    0.00000
- 8670.00    0.00000
- 8680.00    0.00000
- 8690.00    0.00000
- 8700.00    0.00000
- 8710.00    0.00000
- 8720.00    0.00000
- 8730.00    0.00000
- 8740.00    0.00000
- 8750.00    0.00000
- 8760.00    0.00000
- 8770.00    0.00000
- 8780.00    0.00000
- 8790.00    0.00000
- 8800.00    0.00000
- 8810.00    0.00000
- 8820.00    0.00000
- 8830.00    0.00000
- 8840.00    0.00000
- 8850.00    0.00000
- 8860.00    0.00000
- 8870.00    0.00000
- 8880.00    0.00000
- 8890.00    0.00000
- 8900.00    0.00000
- 8910.00    0.00000
- 8920.00    0.00000
- 8930.00    0.00000
- 8940.00    0.00000
- 8950.00    0.00000
- 8960.00    0.00000
- 8970.00    0.00000
- 8980.00    0.00000
- 8990.00    0.00000
- 9000.00    0.00000
- 9010.00    0.00000
- 9020.00    0.00000
- 9030.00    0.00000
- 9040.00    0.00000
- 9050.00    0.00000
- 9060.00    0.00000
- 9070.00    0.00000
- 9080.00    0.00000
- 9090.00    0.00000
- 9100.00    0.00000
- 9110.00    0.00000
- 9120.00    0.00000
- 9130.00    0.00000
- 9140.00    0.00000
- 9150.00    0.00000
- 9160.00    0.00000
- 9170.00    0.00000
- 9180.00    0.00000
- 9190.00    0.00000
- 9200.00    0.03879
- 9210.00    0.07684
- 9220.00    0.11415
- 9230.00    0.15073
- 9240.00    0.18658
- 9250.00    0.22168
- 9260.00    0.25605
- 9270.00    0.28969
- 9280.00    0.32259
- 9290.00    0.35475
- 9300.00    0.35107
- 9310.00    0.34724
- 9320.00    0.34342
- 9330.00    0.33959
- 9340.00    0.33576
- 9350.00    0.33194
- 9360.00    0.32811
- 9370.00    0.32428
- 9380.00    0.32045
- 9390.00    0.31663
- 9400.00    0.31280
- 9410.00    0.30905
- 9420.00    0.30529
- 9430.00    0.30154
- 9440.00    0.29779
- 9450.00    0.29403
- 9460.00    0.29028
- 9470.00    0.28652
- 9480.00    0.28277
- 9490.00    0.27902
- 9500.00    0.27526
- 9510.00    0.27136
- 9520.00    0.26746
- 9530.00    0.26356
- 9540.00    0.25966
- 9550.00    0.25576
- 9560.00    0.25186
- 9570.00    0.24796
- 9580.00    0.24406
- 9590.00    0.24016
- 9600.00    0.23626
- 9610.00    0.23294
- 9620.00    0.22963
- 9630.00    0.22632
- 9640.00    0.22301
- 9650.00    0.21970
- 9660.00    0.21638
- 9670.00    0.21307
- 9680.00    0.20976
- 9690.00    0.20645
- 9700.00    0.20314
- 9710.00    0.19990
- 9720.00    0.19666
- 9730.00    0.19342
- 9740.00    0.19018
- 9750.00    0.18694
- 9760.00    0.18371
- 9770.00    0.18047
- 9780.00    0.17723
- 9790.00    0.17399
- 9800.00    0.17075
- 9810.00    0.16781
- 9820.00    0.16486
- 9830.00    0.16192
- 9840.00    0.15898
- 9850.00    0.15603
- 9860.00    0.15309
- 9870.00    0.15014
- 9880.00    0.14720
- 9890.00    0.14426
- 9900.00    0.14131
- 9910.00    0.13829
- 9920.00    0.13528
- 9930.00    0.13226
- 9940.00    0.12924
- 9950.00    0.12622
- 9960.00    0.12321
- 9970.00    0.12019
- 9980.00    0.11717
- 9990.00    0.11415
-10000.00    0.11114
-10010.00    0.10856
-10020.00    0.10598
-10030.00    0.10341
-10040.00    0.10083
-10050.00    0.09826
-10060.00    0.09568
-10070.00    0.09310
-10080.00    0.09053
-10090.00    0.08795
-10100.00    0.08538
-10110.00    0.08280
-10120.00    0.08022
-10130.00    0.07765
-10140.00    0.07507
-10150.00    0.07250
-10160.00    0.06992
-10170.00    0.06734
-10180.00    0.06477
-10190.00    0.06219
-10200.00    0.05962
-10210.00    0.05770
-10220.00    0.05579
-10230.00    0.05388
-10240.00    0.05196
-10250.00    0.05005
-10260.00    0.04813
-10270.00    0.04622
-10280.00    0.04431
-10290.00    0.04239
-10300.00    0.04048
-10310.00    0.03908
-10320.00    0.03768
-10330.00    0.03628
-10340.00    0.03489
-10350.00    0.03349
-10360.00    0.03209
-10370.00    0.03069
-10380.00    0.02929
-10390.00    0.02789
-10400.00    0.02650
-10410.00    0.02547
-10420.00    0.02444
-10430.00    0.02340
-10440.00    0.02237
-10450.00    0.02134
-10460.00    0.01939
-10470.00    0.01665
-10480.00    0.01410
-10490.00    0.01174
-10500.00    0.00957
-10510.00    0.00793
-10520.00    0.00636
-10530.00    0.00484
-10540.00    0.00339
-10550.00    0.00199
-10560.00    0.00065
-10570.00    0.00000
-10580.00    0.00000
-10590.00    0.00000
-10600.00    0.00000
-10610.00    0.00000
-10620.00    0.00000
-10630.00    0.00000
-10640.00    0.00000
-10650.00    0.00000
-10660.00    0.00000
-10670.00    0.00000
-10680.00    0.00000
-10690.00    0.00000
-10700.00    0.00000
-10710.00    0.00000
-10720.00    0.00000
-10730.00    0.00000
-10740.00    0.00000
-10750.00    0.00000
-10760.00    0.00000
-10770.00    0.00000
-10780.00    0.00000
-10790.00    0.00000
-10800.00    0.00000
-10810.00    0.00000
-10820.00    0.00000
-10830.00    0.00000
-10840.00    0.00000
-10850.00    0.00000
-10860.00    0.00000
-10870.00    0.00000
-10880.00    0.00000
-10890.00    0.00000
-10900.00    0.00000
-10910.00    0.00000
-10920.00    0.00000
-10930.00    0.00000
-10940.00    0.00000
-10950.00    0.00000
-10960.00    0.00000
-10970.00    0.00000
-10980.00    0.00000
-10990.00    0.00000
+ 8500.00    0.00001
+ 8510.00    0.00001
+ 8520.00    0.00001
+ 8530.00    0.00001
+ 8540.00    0.00001
+ 8550.00    0.00001
+ 8560.00    0.00001
+ 8570.00    0.00001
+ 8580.00    0.00001
+ 8590.00    0.00001
+ 8600.00    0.00001
+ 8610.00    0.00001
+ 8620.00    0.00001
+ 8630.00    0.00001
+ 8640.00    0.00001
+ 8650.00    0.00001
+ 8660.00    0.00001
+ 8670.00    0.00001
+ 8680.00    0.00001
+ 8690.00    0.00001
+ 8700.00    0.00001
+ 8710.00    0.00001
+ 8720.00    0.00001
+ 8730.00    0.00001
+ 8740.00    0.00001
+ 8750.00    0.00001
+ 8760.00    0.00001
+ 8770.00    0.00001
+ 8780.00    0.00001
+ 8790.00    0.00001
+ 8800.00    0.00001
+ 8810.00    0.00001
+ 8820.00    0.00001
+ 8830.00    0.00001
+ 8840.00    0.00001
+ 8850.00    0.00001
+ 8860.00    0.00002
+ 8870.00    0.00002
+ 8880.00    0.00002
+ 8890.00    0.00002
+ 8900.00    0.00002
+ 8910.00    0.00003
+ 8920.00    0.00003
+ 8930.00    0.00004
+ 8940.00    0.00005
+ 8950.00    0.00006
+ 8960.00    0.00007
+ 8970.00    0.00008
+ 8980.00    0.00010
+ 8990.00    0.00012
+ 9000.00    0.00015
+ 9010.00    0.00020
+ 9020.00    0.00029
+ 9030.00    0.00042
+ 9040.00    0.00067
+ 9050.00    0.00113
+ 9060.00    0.00206
+ 9070.00    0.00379
+ 9080.00    0.00654
+ 9090.00    0.01016
+ 9100.00    0.01473
+ 9110.00    0.02009
+ 9120.00    0.02491
+ 9130.00    0.02787
+ 9140.00    0.03080
+ 9150.00    0.03360
+ 9160.00    0.03736
+ 9170.00    0.04152
+ 9180.00    0.04629
+ 9190.00    0.05196
+ 9200.00    0.05965
+ 9210.00    0.06897
+ 9220.00    0.08142
+ 9230.00    0.09667
+ 9240.00    0.11727
+ 9250.00    0.14703
+ 9260.00    0.18512
+ 9270.00    0.22564
+ 9280.00    0.25914
+ 9290.00    0.27504
+ 9300.00    0.27413
+ 9310.00    0.26672
+ 9320.00    0.25628
+ 9330.00    0.25043
+ 9340.00    0.25056
+ 9350.00    0.25780
+ 9360.00    0.26953
+ 9370.00    0.28027
+ 9380.00    0.29300
+ 9390.00    0.30125
+ 9400.00    0.30476
+ 9410.00    0.30774
+ 9420.00    0.30754
+ 9430.00    0.30457
+ 9440.00    0.30033
+ 9450.00    0.29852
+ 9460.00    0.29537
+ 9470.00    0.29414
+ 9480.00    0.29372
+ 9490.00    0.29135
+ 9500.00    0.29245
+ 9510.00    0.29120
+ 9520.00    0.29163
+ 9530.00    0.28776
+ 9540.00    0.28561
+ 9550.00    0.28216
+ 9560.00    0.27887
+ 9570.00    0.27618
+ 9580.00    0.27160
+ 9590.00    0.26462
+ 9600.00    0.25744
+ 9610.00    0.25295
+ 9620.00    0.24872
+ 9630.00    0.24309
+ 9640.00    0.24029
+ 9650.00    0.23722
+ 9660.00    0.23592
+ 9670.00    0.23303
+ 9680.00    0.23185
+ 9690.00    0.22828
+ 9700.00    0.22377
+ 9710.00    0.22119
+ 9720.00    0.21880
+ 9730.00    0.21568
+ 9740.00    0.21221
+ 9750.00    0.20819
+ 9760.00    0.20421
+ 9770.00    0.19998
+ 9780.00    0.19609
+ 9790.00    0.19067
+ 9800.00    0.18498
+ 9810.00    0.18081
+ 9820.00    0.17709
+ 9830.00    0.17290
+ 9840.00    0.16863
+ 9850.00    0.16594
+ 9860.00    0.16317
+ 9870.00    0.15992
+ 9880.00    0.15856
+ 9890.00    0.15453
+ 9900.00    0.15212
+ 9910.00    0.14915
+ 9920.00    0.14682
+ 9930.00    0.14462
+ 9940.00    0.14245
+ 9950.00    0.14032
+ 9960.00    0.13813
+ 9970.00    0.13557
+ 9980.00    0.13274
+ 9990.00    0.12956
+10000.00    0.12631
+10010.00    0.12358
+10020.00    0.12131
+10030.00    0.11828
+10040.00    0.11527
+10050.00    0.11281
+10060.00    0.10998
+10070.00    0.10693
+10080.00    0.10413
+10090.00    0.10062
+10100.00    0.09759
+10110.00    0.09418
+10120.00    0.09121
+10130.00    0.08794
+10140.00    0.08498
+10150.00    0.08236
+10160.00    0.07916
+10170.00    0.07608
+10180.00    0.07280
+10190.00    0.06992
+10200.00    0.06690
+10210.00    0.06474
+10220.00    0.06270
+10230.00    0.06034
+10240.00    0.05816
+10250.00    0.05627
+10260.00    0.05452
+10270.00    0.05255
+10280.00    0.05035
+10290.00    0.04810
+10300.00    0.04589
+10310.00    0.04451
+10320.00    0.04310
+10330.00    0.04172
+10340.00    0.04014
+10350.00    0.03859
+10360.00    0.03726
+10370.00    0.03553
+10380.00    0.03402
+10390.00    0.03240
+10400.00    0.03080
+10410.00    0.02982
+10420.00    0.02864
+10430.00    0.02743
+10440.00    0.02619
+10450.00    0.02501
+10460.00    0.02386
+10470.00    0.02278
+10480.00    0.02160
+10490.00    0.02026
+10500.00    0.01900
+10510.00    0.01866
+10520.00    0.01823
+10530.00    0.01788
+10540.00    0.01745
+10550.00    0.01709
+10560.00    0.01676
+10570.00    0.01634
+10580.00    0.01602
+10590.00    0.01561
+10600.00    0.01526
+10610.00    0.01482
+10620.00    0.01446
+10630.00    0.01407
+10640.00    0.01371
+10650.00    0.01330
+10660.00    0.01291
+10670.00    0.01258
+10680.00    0.01224
+10690.00    0.01185
+10700.00    0.01138
+10710.00    0.01100
+10720.00    0.01064
+10730.00    0.01024
+10740.00    0.00984
+10750.00    0.00948
+10760.00    0.00916
+10770.00    0.00871
+10780.00    0.00837
+10790.00    0.00797
+10800.00    0.00749
+10810.00    0.00714
+10820.00    0.00671
+10830.00    0.00631
+10840.00    0.00590
+10850.00    0.00547
+10860.00    0.00504
+10870.00    0.00463
+10880.00    0.00418
+10890.00    0.00374
+10900.00    0.00327
+10910.00    0.00283
+10920.00    0.00241
+10930.00    0.00199
+10940.00    0.00159
+10950.00    0.00123
+10960.00    0.00090
+10970.00    0.00061
+10980.00    0.00037
+10990.00    0.00017
 11000.00    0.00000

ObservationSim/Instrument/data/throughputs/z_throughput.txt

-# z_css
+# z_cssc
+# lambda_Angst  throughput
  2000.00    0.00000
  2010.00    0.00000
  2020.00    0.00000
@@ -273,19 +274,19 @@
  4710.00    0.00000
  4720.00    0.00000
  4730.00    0.00000
- 4740.00    0.00000
- 4750.00    0.00000
- 4760.00    0.00000
- 4770.00    0.00000
- 4780.00    0.00000
- 4790.00    0.00000
- 4800.00    0.00000
- 4810.00    0.00000
- 4820.00    0.00000
- 4830.00    0.00000
- 4840.00    0.00000
- 4850.00    0.00000
- 4860.00    0.00000
+ 4740.00    0.00001
+ 4750.00    0.00001
+ 4760.00    0.00001
+ 4770.00    0.00001
+ 4780.00    0.00002
+ 4790.00    0.00003
+ 4800.00    0.00004
+ 4810.00    0.00004
+ 4820.00    0.00005
+ 4830.00    0.00004
+ 4840.00    0.00003
+ 4850.00    0.00002
+ 4860.00    0.00001
  4870.00    0.00000
  4880.00    0.00000
  4890.00    0.00000
@@ -349,16 +350,16 @@
  5470.00    0.00000
  5480.00    0.00000
  5490.00    0.00000
- 5500.00    0.00000
- 5510.00    0.00000
- 5520.00    0.00000
- 5530.00    0.00000
- 5540.00    0.00000
- 5550.00    0.00000
- 5560.00    0.00000
- 5570.00    0.00000
- 5580.00    0.00000
- 5590.00    0.00000
+ 5500.00    0.00001
+ 5510.00    0.00001
+ 5520.00    0.00002
+ 5530.00    0.00002
+ 5540.00    0.00002
+ 5550.00    0.00002
+ 5560.00    0.00002
+ 5570.00    0.00001
+ 5580.00    0.00001
+ 5590.00    0.00001
  5600.00    0.00000
  5610.00    0.00000
  5620.00    0.00000
@@ -372,20 +373,20 @@
  5700.00    0.00000
  5710.00    0.00000
  5720.00    0.00000
- 5730.00    0.00000
- 5740.00    0.00000
- 5750.00    0.00000
- 5760.00    0.00000
- 5770.00    0.00000
- 5780.00    0.00000
- 5790.00    0.00000
- 5800.00    0.00000
- 5810.00    0.00000
- 5820.00    0.00000
- 5830.00    0.00000
- 5840.00    0.00000
- 5850.00    0.00000
- 5860.00    0.00000
+ 5730.00    0.00001
+ 5740.00    0.00001
+ 5750.00    0.00001
+ 5760.00    0.00001
+ 5770.00    0.00002
+ 5780.00    0.00002
+ 5790.00    0.00003
+ 5800.00    0.00004
+ 5810.00    0.00004
+ 5820.00    0.00004
+ 5830.00    0.00003
+ 5840.00    0.00002
+ 5850.00    0.00001
+ 5860.00    0.00001
  5870.00    0.00000
  5880.00    0.00000
  5890.00    0.00000
@@ -599,304 +600,304 @@
  7970.00    0.00000
  7980.00    0.00000
  7990.00    0.00000
- 8000.00    0.00000
- 8010.00    0.00000
- 8020.00    0.00000
- 8030.00    0.00000
- 8040.00    0.00000
- 8050.00    0.00000
- 8060.00    0.00000
- 8070.00    0.00000
- 8080.00    0.00000
- 8090.00    0.00000
- 8100.00    0.00000
- 8110.00    0.00000
- 8120.00    0.00000
- 8130.00    0.00000
- 8140.00    0.00000
- 8150.00    0.00000
- 8160.00    0.00000
- 8170.00    0.00000
- 8180.00    0.00000
- 8190.00    0.00000
- 8200.00    0.00000
- 8210.00    0.00000
- 8220.00    0.00000
- 8230.00    0.00000
- 8240.00    0.00000
- 8250.00    0.00000
- 8260.00    0.00000
- 8270.00    0.00000
- 8280.00    0.00000
- 8290.00    0.00000
- 8300.00    0.03467
- 8310.00    0.10375
- 8320.00    0.17247
- 8330.00    0.24083
- 8340.00    0.30883
- 8350.00    0.37646
- 8360.00    0.44374
- 8370.00    0.51066
- 8380.00    0.57722
- 8390.00    0.60956
- 8400.00    0.60794
- 8410.00    0.60617
- 8420.00    0.60440
- 8430.00    0.60264
- 8440.00    0.60087
- 8450.00    0.59910
- 8460.00    0.59734
- 8470.00    0.59557
- 8480.00    0.59380
- 8490.00    0.59204
- 8500.00    0.59027
- 8510.00    0.58814
- 8520.00    0.58600
- 8530.00    0.58387
- 8540.00    0.58173
- 8550.00    0.57960
- 8560.00    0.57747
- 8570.00    0.57533
- 8580.00    0.57320
- 8590.00    0.57106
- 8600.00    0.56893
- 8610.00    0.56643
- 8620.00    0.56392
- 8630.00    0.56142
- 8640.00    0.55892
- 8650.00    0.55642
- 8660.00    0.55391
- 8670.00    0.55141
- 8680.00    0.54891
- 8690.00    0.54641
- 8700.00    0.54390
- 8710.00    0.54133
- 8720.00    0.53875
- 8730.00    0.53618
- 8740.00    0.53360
- 8750.00    0.53102
- 8760.00    0.52845
- 8770.00    0.52587
- 8780.00    0.52330
- 8790.00    0.52072
- 8800.00    0.51814
- 8810.00    0.51535
- 8820.00    0.51255
- 8830.00    0.50975
- 8840.00    0.50696
- 8850.00    0.50416
- 8860.00    0.50136
- 8870.00    0.49857
- 8880.00    0.49577
- 8890.00    0.49297
- 8900.00    0.49018
- 8910.00    0.48716
- 8920.00    0.48414
- 8930.00    0.48112
- 8940.00    0.47811
- 8950.00    0.47509
- 8960.00    0.47207
- 8970.00    0.46905
- 8980.00    0.46604
- 8990.00    0.46302
- 9000.00    0.46000
- 9010.00    0.45654
- 9020.00    0.45308
- 9030.00    0.44962
- 9040.00    0.44616
- 9050.00    0.44270
- 9060.00    0.43924
- 9070.00    0.43579
- 9080.00    0.43233
- 9090.00    0.42887
- 9100.00    0.42541
- 9110.00    0.42165
- 9120.00    0.41790
- 9130.00    0.41415
- 9140.00    0.41039
- 9150.00    0.40664
- 9160.00    0.40289
- 9170.00    0.39913
- 9180.00    0.39538
- 9190.00    0.39163
- 9200.00    0.38787
- 9210.00    0.38419
- 9220.00    0.38051
- 9230.00    0.37683
- 9240.00    0.37315
- 9250.00    0.36947
- 9260.00    0.36579
- 9270.00    0.36211
- 9280.00    0.35843
- 9290.00    0.35475
- 9300.00    0.35107
- 9310.00    0.34724
- 9320.00    0.34342
- 9330.00    0.33959
- 9340.00    0.33576
- 9350.00    0.33194
- 9360.00    0.32811
- 9370.00    0.32428
- 9380.00    0.32045
- 9390.00    0.31663
- 9400.00    0.31280
- 9410.00    0.30905
- 9420.00    0.30529
- 9430.00    0.30154
- 9440.00    0.29779
- 9450.00    0.29403
- 9460.00    0.29028
- 9470.00    0.28652
- 9480.00    0.28277
- 9490.00    0.27902
- 9500.00    0.27526
- 9510.00    0.27136
- 9520.00    0.26746
- 9530.00    0.26356
- 9540.00    0.25966
- 9550.00    0.25576
- 9560.00    0.25186
- 9570.00    0.24796
- 9580.00    0.24406
- 9590.00    0.24016
- 9600.00    0.23626
- 9610.00    0.23294
- 9620.00    0.22963
- 9630.00    0.22632
- 9640.00    0.22301
- 9650.00    0.21970
- 9660.00    0.21638
- 9670.00    0.21307
- 9680.00    0.20976
- 9690.00    0.20645
- 9700.00    0.20314
- 9710.00    0.19990
- 9720.00    0.19666
- 9730.00    0.19342
- 9740.00    0.19018
- 9750.00    0.18694
- 9760.00    0.18371
- 9770.00    0.18047
- 9780.00    0.17723
- 9790.00    0.17399
- 9800.00    0.17075
- 9810.00    0.16781
- 9820.00    0.16486
- 9830.00    0.16192
- 9840.00    0.15898
- 9850.00    0.15603
- 9860.00    0.15309
- 9870.00    0.15014
- 9880.00    0.14720
- 9890.00    0.14426
- 9900.00    0.14131
- 9910.00    0.13829
- 9920.00    0.13528
- 9930.00    0.13226
- 9940.00    0.12924
- 9950.00    0.12622
- 9960.00    0.12321
- 9970.00    0.12019
- 9980.00    0.11717
- 9990.00    0.11415
-10000.00    0.11114
-10010.00    0.10856
-10020.00    0.10598
-10030.00    0.10341
-10040.00    0.10083
-10050.00    0.09826
-10060.00    0.09568
-10070.00    0.09310
-10080.00    0.09053
-10090.00    0.08795
-10100.00    0.08538
-10110.00    0.08280
-10120.00    0.08022
-10130.00    0.07765
-10140.00    0.07507
-10150.00    0.07250
-10160.00    0.06992
-10170.00    0.06734
-10180.00    0.06477
-10190.00    0.06219
-10200.00    0.05962
-10210.00    0.05770
-10220.00    0.05579
-10230.00    0.05388
-10240.00    0.05196
-10250.00    0.05005
-10260.00    0.04813
-10270.00    0.04622
-10280.00    0.04431
-10290.00    0.04239
-10300.00    0.04048
-10310.00    0.03908
-10320.00    0.03768
-10330.00    0.03628
-10340.00    0.03489
-10350.00    0.03349
-10360.00    0.03209
-10370.00    0.03069
-10380.00    0.02929
-10390.00    0.02789
-10400.00    0.02650
-10410.00    0.02547
-10420.00    0.02444
-10430.00    0.02340
-10440.00    0.02237
-10450.00    0.02134
-10460.00    0.01939
-10470.00    0.01665
-10480.00    0.01410
-10490.00    0.01174
-10500.00    0.00957
-10510.00    0.00793
-10520.00    0.00636
-10530.00    0.00484
-10540.00    0.00339
-10550.00    0.00199
-10560.00    0.00065
-10570.00    0.00000
-10580.00    0.00000
-10590.00    0.00000
-10600.00    0.00000
-10610.00    0.00000
-10620.00    0.00000
-10630.00    0.00000
-10640.00    0.00000
-10650.00    0.00000
-10660.00    0.00000
-10670.00    0.00000
-10680.00    0.00000
-10690.00    0.00000
-10700.00    0.00000
-10710.00    0.00000
-10720.00    0.00000
-10730.00    0.00000
-10740.00    0.00000
-10750.00    0.00000
-10760.00    0.00000
-10770.00    0.00000
-10780.00    0.00000
-10790.00    0.00000
-10800.00    0.00000
-10810.00    0.00000
-10820.00    0.00000
-10830.00    0.00000
-10840.00    0.00000
-10850.00    0.00000
-10860.00    0.00000
-10870.00    0.00000
-10880.00    0.00000
-10890.00    0.00000
-10900.00    0.00000
-10910.00    0.00000
-10920.00    0.00000
-10930.00    0.00000
-10940.00    0.00000
-10950.00    0.00000
-10960.00    0.00000
-10970.00    0.00000
-10980.00    0.00000
-10990.00    0.00000
+ 8000.00    0.00002
+ 8010.00    0.00003
+ 8020.00    0.00003
+ 8030.00    0.00003
+ 8040.00    0.00003
+ 8050.00    0.00004
+ 8060.00    0.00004
+ 8070.00    0.00005
+ 8080.00    0.00007
+ 8090.00    0.00008
+ 8100.00    0.00009
+ 8110.00    0.00013
+ 8120.00    0.00018
+ 8130.00    0.00026
+ 8140.00    0.00040
+ 8150.00    0.00065
+ 8160.00    0.00112
+ 8170.00    0.00185
+ 8180.00    0.00305
+ 8190.00    0.00475
+ 8200.00    0.00704
+ 8210.00    0.00994
+ 8220.00    0.01366
+ 8230.00    0.01820
+ 8240.00    0.02345
+ 8250.00    0.03058
+ 8260.00    0.03900
+ 8270.00    0.04796
+ 8280.00    0.05876
+ 8290.00    0.07147
+ 8300.00    0.08580
+ 8310.00    0.10118
+ 8320.00    0.11803
+ 8330.00    0.13528
+ 8340.00    0.15451
+ 8350.00    0.17500
+ 8360.00    0.19415
+ 8370.00    0.21555
+ 8380.00    0.23737
+ 8390.00    0.26134
+ 8400.00    0.28959
+ 8410.00    0.31549
+ 8420.00    0.34437
+ 8430.00    0.37460
+ 8440.00    0.40913
+ 8450.00    0.43985
+ 8460.00    0.46810
+ 8470.00    0.50016
+ 8480.00    0.52985
+ 8490.00    0.53965
+ 8500.00    0.54721
+ 8510.00    0.55913
+ 8520.00    0.56785
+ 8530.00    0.57017
+ 8540.00    0.57030
+ 8550.00    0.56308
+ 8560.00    0.56262
+ 8570.00    0.55976
+ 8580.00    0.56087
+ 8590.00    0.56322
+ 8600.00    0.56420
+ 8610.00    0.57465
+ 8620.00    0.58293
+ 8630.00    0.58455
+ 8640.00    0.58646
+ 8650.00    0.58652
+ 8660.00    0.59005
+ 8670.00    0.59086
+ 8680.00    0.59135
+ 8690.00    0.59191
+ 8700.00    0.59066
+ 8710.00    0.58680
+ 8720.00    0.58734
+ 8730.00    0.58443
+ 8740.00    0.58584
+ 8750.00    0.58551
+ 8760.00    0.58631
+ 8770.00    0.57497
+ 8780.00    0.56742
+ 8790.00    0.56521
+ 8800.00    0.56529
+ 8810.00    0.56261
+ 8820.00    0.55838
+ 8830.00    0.55504
+ 8840.00    0.55008
+ 8850.00    0.54926
+ 8860.00    0.55300
+ 8870.00    0.55054
+ 8880.00    0.54841
+ 8890.00    0.54389
+ 8900.00    0.54021
+ 8910.00    0.53897
+ 8920.00    0.53684
+ 8930.00    0.53275
+ 8940.00    0.52614
+ 8950.00    0.52261
+ 8960.00    0.51701
+ 8970.00    0.51777
+ 8980.00    0.51666
+ 8990.00    0.50958
+ 9000.00    0.50227
+ 9010.00    0.49876
+ 9020.00    0.49809
+ 9030.00    0.49215
+ 9040.00    0.48671
+ 9050.00    0.48609
+ 9060.00    0.48684
+ 9070.00    0.48709
+ 9080.00    0.48235
+ 9090.00    0.47727
+ 9100.00    0.47371
+ 9110.00    0.47099
+ 9120.00    0.46685
+ 9130.00    0.46190
+ 9140.00    0.45953
+ 9150.00    0.45711
+ 9160.00    0.45402
+ 9170.00    0.44954
+ 9180.00    0.44596
+ 9190.00    0.43748
+ 9200.00    0.43258
+ 9210.00    0.42686
+ 9220.00    0.42501
+ 9230.00    0.41694
+ 9240.00    0.41017
+ 9250.00    0.40690
+ 9260.00    0.40273
+ 9270.00    0.40115
+ 9280.00    0.39850
+ 9290.00    0.39300
+ 9300.00    0.38771
+ 9310.00    0.38511
+ 9320.00    0.38115
+ 9330.00    0.37657
+ 9340.00    0.37304
+ 9350.00    0.37035
+ 9360.00    0.36799
+ 9370.00    0.36361
+ 9380.00    0.36175
+ 9390.00    0.35653
+ 9400.00    0.35207
+ 9410.00    0.34870
+ 9420.00    0.34540
+ 9430.00    0.34000
+ 9440.00    0.33454
+ 9450.00    0.33118
+ 9460.00    0.32608
+ 9470.00    0.32235
+ 9480.00    0.31854
+ 9490.00    0.31280
+ 9500.00    0.30897
+ 9510.00    0.30432
+ 9520.00    0.30050
+ 9530.00    0.29516
+ 9540.00    0.29060
+ 9550.00    0.28636
+ 9560.00    0.28360
+ 9570.00    0.28103
+ 9580.00    0.27826
+ 9590.00    0.27258
+ 9600.00    0.26635
+ 9610.00    0.26313
+ 9620.00    0.26024
+ 9630.00    0.25426
+ 9640.00    0.25093
+ 9650.00    0.24715
+ 9660.00    0.24534
+ 9670.00    0.24135
+ 9680.00    0.23866
+ 9690.00    0.23333
+ 9700.00    0.22699
+ 9710.00    0.22368
+ 9720.00    0.21986
+ 9730.00    0.21567
+ 9740.00    0.21298
+ 9750.00    0.20891
+ 9760.00    0.20503
+ 9770.00    0.20208
+ 9780.00    0.19933
+ 9790.00    0.19468
+ 9800.00    0.19016
+ 9810.00    0.18628
+ 9820.00    0.18377
+ 9830.00    0.18008
+ 9840.00    0.17676
+ 9850.00    0.17416
+ 9860.00    0.17185
+ 9870.00    0.16854
+ 9880.00    0.16681
+ 9890.00    0.16231
+ 9900.00    0.15922
+ 9910.00    0.15595
+ 9920.00    0.15261
+ 9930.00    0.14979
+ 9940.00    0.14714
+ 9950.00    0.14405
+ 9960.00    0.14113
+ 9970.00    0.13766
+ 9980.00    0.13428
+ 9990.00    0.13036
+10000.00    0.12687
+10010.00    0.12353
+10020.00    0.12086
+10030.00    0.11805
+10040.00    0.11487
+10050.00    0.11219
+10060.00    0.10946
+10070.00    0.10670
+10080.00    0.10390
+10090.00    0.10063
+10100.00    0.09769
+10110.00    0.09469
+10120.00    0.09182
+10130.00    0.08876
+10140.00    0.08596
+10150.00    0.08345
+10160.00    0.08038
+10170.00    0.07757
+10180.00    0.07454
+10190.00    0.07143
+10200.00    0.06847
+10210.00    0.06625
+10220.00    0.06415
+10230.00    0.06172
+10240.00    0.05948
+10250.00    0.05752
+10260.00    0.05559
+10270.00    0.05342
+10280.00    0.05111
+10290.00    0.04861
+10300.00    0.04624
+10310.00    0.04473
+10320.00    0.04323
+10330.00    0.04159
+10340.00    0.03990
+10350.00    0.03836
+10360.00    0.03685
+10370.00    0.03495
+10380.00    0.03347
+10390.00    0.03179
+10400.00    0.03022
+10410.00    0.02922
+10420.00    0.02809
+10430.00    0.02687
+10440.00    0.02562
+10450.00    0.02458
+10460.00    0.02340
+10470.00    0.02243
+10480.00    0.02127
+10490.00    0.01998
+10500.00    0.01877
+10510.00    0.01843
+10520.00    0.01806
+10530.00    0.01774
+10540.00    0.01732
+10550.00    0.01701
+10560.00    0.01671
+10570.00    0.01628
+10580.00    0.01597
+10590.00    0.01558
+10600.00    0.01522
+10610.00    0.01479
+10620.00    0.01442
+10630.00    0.01400
+10640.00    0.01363
+10650.00    0.01319
+10660.00    0.01273
+10670.00    0.01234
+10680.00    0.01193
+10690.00    0.01143
+10700.00    0.01087
+10710.00    0.01034
+10720.00    0.00980
+10730.00    0.00922
+10740.00    0.00860
+10750.00    0.00802
+10760.00    0.00742
+10770.00    0.00671
+10780.00    0.00610
+10790.00    0.00546
+10800.00    0.00478
+10810.00    0.00421
+10820.00    0.00366
+10830.00    0.00314
+10840.00    0.00267
+10850.00    0.00226
+10860.00    0.00189
+10870.00    0.00157
+10880.00    0.00130
+10890.00    0.00106
+10900.00    0.00085
+10910.00    0.00068
+10920.00    0.00054
+10930.00    0.00042
+10940.00    0.00032
+10950.00    0.00024
+10960.00    0.00017
+10970.00    0.00011
+10980.00    0.00007
+10990.00    0.00003
 11000.00    0.00000

ObservationSim/MockObject/CatalogBase.py

@@ -38,8 +38,8 @@ class CatalogBase(metaclass=ABCMeta):
             "mag_use_normal":100.,
             "theta":0.,
             "kappa":0.,
-            "gamma1":0.,
-            "gamma2":0.,
+            "g1":0.,
+            "g2":0.,
             "bfrac":0.,
             "av":0.,
             "redden":0.,
@@ -48,11 +48,24 @@ class CatalogBase(metaclass=ABCMeta):
             "ell_bulge":0.,
             "ell_disk":0.,
             "ell_tot":0.,
+            "e1_disk":0.,
+            "e2_disk":0.,
+            "e1_bulge":0.,
+            "e2_bulge":0.,
             "teff":0.,
             "logg":0.,
             "feh":0.,
-            "g1":0.,
-            "g2":0.,
+            # C6 galaxies parameters
+            "e1":0.,
+            "e2":0.,
+            "bulgemass":0.,
+            "diskmass":0.,
+            "size":0.,
+            "detA":0.,
+            "type":0,
+            "veldisp":0.,
+            "coeff": np.zeros(20),
+            # Astrometry related
             "pmra":0.,
             "pmdec":0.,
             "rv":0.,

ObservationSim/MockObject/Galaxy.py

@@ -9,31 +9,37 @@ from ObservationSim.MockObject._util import eObs, integrate_sed_bandpass, getNor
 from ObservationSim.MockObject.SpecDisperser import SpecDisperser
 from ObservationSim.MockObject.MockObject import MockObject
 
+# import tracemalloc
+
 class Galaxy(MockObject):
     def __init__(self, param, rotation=None, logger=None):
         super().__init__(param, logger=logger)
-        self.thetaR = self.param["theta"]
-        self.bfrac = self.param["bfrac"]
-        self.hlr_disk = self.param["hlr_disk"]
-        self.hlr_bulge = self.param["hlr_bulge"]
+        # self.thetaR = self.param["theta"]
+        # self.bfrac = self.param["bfrac"]
+        # self.hlr_disk = self.param["hlr_disk"]
+        # self.hlr_bulge = self.param["hlr_bulge"]
 
         # Extract ellipticity components
-        self.e_disk = galsim.Shear(g=self.param["ell_disk"], beta=self.thetaR*galsim.degrees)
-        self.e_bulge = galsim.Shear(g=self.param["ell_bulge"], beta=self.thetaR*galsim.degrees)
-        self.e_total = galsim.Shear(g=self.param["ell_tot"], beta=self.thetaR*galsim.degrees)
-        self.e1_disk, self.e2_disk = self.e_disk.g1, self.e_disk.g2
-        self.e1_bulge, self.e2_bulge = self.e_bulge.g1, self.e_bulge.g2
-        self.e1_total, self.e2_total = self.e_total.g1, self.e_total.g2
+        # self.e_disk = galsim.Shear(g=self.param["ell_disk"], beta=self.thetaR*galsim.degrees)
+        # self.e_bulge = galsim.Shear(g=self.param["ell_bulge"], beta=self.thetaR*galsim.degrees)
+        # self.e_total = galsim.Shear(g=self.param["ell_tot"], beta=self.thetaR*galsim.degrees)
+        # self.e1_disk, self.e2_disk = self.e_disk.g1, self.e_disk.g2
+        # self.e1_bulge, self.e2_bulge = self.e_bulge.g1, self.e_bulge.g2
+        # self.e1_total, self.e2_total = self.e_total.g1, self.e_total.g2
 
         if rotation is not None:
             self.rotateEllipticity(rotation)
+        if not hasattr(self, "disk_sersic_idx"):
+            self.disk_sersic_idx = 1.
+        if not hasattr(self, "bulge_sersic_idx"):
+            self.bulge_sersic_idx = 4.
 
     def unload_SED(self):
         """(Test) free up SED memory
         """
         del self.sed
 
-    def getGSObj_multiband(self, tel, psf_list, bandpass_list, filt, nphotons_tot=None, g1=0, g2=0, exptime=150.):
+    def getGSObj_multiband(self, tel, psf_list, bandpass_list, filt, nphotons_tot=None, g1=0, g2=0, exptime=150., fd_shear=None):
         if len(psf_list) != len(bandpass_list):
             raise ValueError("!!!The number of PSF profiles and the number of bandpasses must be equal.")
         objs = []
@@ -63,10 +69,10 @@ class Galaxy(MockObject):
                 return -1
 
             psf = psf_list[i]
-            disk = galsim.Sersic(n=1.0, half_light_radius=self.hlr_disk, flux=1.0)
+            disk = galsim.Sersic(n=self.disk_sersic_idx, half_light_radius=self.hlr_disk, flux=1.0)
             disk_shape = galsim.Shear(g1=self.e1_disk, g2=self.e2_disk)
             disk = disk.shear(disk_shape)
-            bulge = galsim.Sersic(n=4.0, half_light_radius=self.hlr_bulge, flux=1.0)
+            bulge = galsim.Sersic(n=self.bulge_sersic_idx, half_light_radius=self.hlr_bulge, flux=1.0)
             bulge_shape = galsim.Shear(g1=self.e1_bulge, g2=self.e2_bulge)
             bulge = bulge.shear(bulge_shape)
 
@@ -75,11 +81,14 @@ class Galaxy(MockObject):
             gal_shear = galsim.Shear(g1=g1, g2=g2)
             gal = gal.shear(gal_shear)
             gal = galsim.Convolve(psf, gal)
+            
+            if fd_shear is not None:
+                gal = gal.shear(fd_shear)
             objs.append(gal)
         final = galsim.Sum(objs)
         return final
 
-    def drawObj_multiband(self, tel, pos_img, psf_model, bandpass_list, filt, chip, nphotons_tot=None, g1=0, g2=0, exptime=150.):
+    def drawObj_multiband(self, tel, pos_img, psf_model, bandpass_list, filt, chip, nphotons_tot=None, g1=0, g2=0, exptime=150., fd_shear=None):
         if nphotons_tot == None:
             nphotons_tot = self.getElectronFluxFilt(filt, tel, exptime)
         # print("nphotons_tot = ", nphotons_tot)
@@ -89,15 +98,18 @@ class Galaxy(MockObject):
         except Exception as e:
             print(e)
             self.logger.error(e)
-            return False
+            return 2, None
 
         nphotons_sum = 0
         photons_list = []
         xmax, ymax = 0, 0
-
+        
+        # # [C6 TEST]
         # print('hlr_disk = %.4f, hlr_bulge = %.4f'%(self.hlr_disk, self.hlr_bulge))
+        # tracemalloc.start()
+
         big_galaxy = False
-        if self.hlr_disk > 3.0: # Very big galaxy
+        if self.hlr_disk > 3.0 or self.hlr_bulge > 3.0: # Very big galaxy
             big_galaxy = True
 
         # (TEST) Galsim Parameters
@@ -134,22 +146,23 @@ class Galaxy(MockObject):
             if not (ratio == -1 or (ratio != ratio)):
                 nphotons = ratio * nphotons_tot
             else:
-                # return False
                 continue
             nphotons_sum += nphotons
+
+            # # [C6 TEST]
             # print("nphotons_sub-band_%d = %.2f"%(i, nphotons))
 
             psf, pos_shear = psf_model.get_PSF(chip=chip, pos_img=pos_img, bandpass=bandpass, folding_threshold=folding_threshold)
-            disk = galsim.Sersic(n=1.0, half_light_radius=self.hlr_disk, flux=1.0, gsparams=gsp)
+            disk = galsim.Sersic(n=self.disk_sersic_idx, half_light_radius=self.hlr_disk, flux=1.0, gsparams=gsp)
             disk_shape = galsim.Shear(g1=self.e1_disk, g2=self.e2_disk)
             disk = disk.shear(disk_shape)
-            bulge = galsim.Sersic(n=4.0, half_light_radius=self.hlr_bulge, flux=1.0, gsparams=gsp)
+            bulge = galsim.Sersic(n=self.bulge_sersic_idx, half_light_radius=self.hlr_bulge, flux=1.0, gsparams=gsp)
             bulge_shape = galsim.Shear(g1=self.e1_bulge, g2=self.e2_bulge)
             bulge = bulge.shear(bulge_shape)
 
             gal = self.bfrac * bulge + (1.0 - self.bfrac) * disk
 
-            # # (TEST) Random knots
+            # (TEST) Random knots
             # knots = galsim.RandomKnots(npoints=100, profile=disk)
             # kfrac = np.random.random()*(1.0 - self.bfrac)
             # gal = self.bfrac * bulge + (1.0 - self.bfrac - kfrac) * disk + kfrac * knots
@@ -158,93 +171,82 @@ class Galaxy(MockObject):
             gal_shear = galsim.Shear(g1=g1, g2=g2)
             gal = gal.shear(gal_shear)
 
-            if self.hlr_disk < 10.0: # Not apply PSF for very big galaxy
+            if not big_galaxy: # Not apply PSF for very big galaxy
                 gal = galsim.Convolve(psf, gal)
+                if fd_shear is not None:
+                    gal = gal.shear(fd_shear)
 
             # Use (explicit) stamps to draw
-            # stamp = gal.drawImage(wcs=self.localWCS, method='phot', offset=self.offset, save_photons=True)
-            # xmax = max(xmax, stamp.xmax)
-            # ymax = max(ymax, stamp.ymax)
-            # photons = stamp.photons
-            # photons.x += self.x_nominal
-            # photons.y += self.y_nominal
-            # photons_list.append(photons)
-
             stamp = gal.drawImage(wcs=real_wcs_local, method='phot', offset=offset, save_photons=True)
-            xmax = max(xmax, stamp.xmax)
-            ymax = max(ymax, stamp.ymax)
+            
+            xmax = max(xmax, stamp.xmax - stamp.xmin)
+            ymax = max(ymax, stamp.ymax - stamp.ymin)
+
             photons = stamp.photons
             photons.x += x_nominal
             photons.y += y_nominal
             photons_list.append(photons)
+            del gal
 
+        # # [C6 TEST]
         # print('xmax = %d, ymax = %d '%(xmax, ymax))
+        # # Output memory usage
+        # snapshot = tracemalloc.take_snapshot()
+        # top_stats = snapshot.statistics('lineno')
+        # for stat in top_stats[:10]:
+        #     print(stat)
 
         stamp = galsim.ImageF(int(xmax * 1.1), int(ymax * 1.1))
         stamp.wcs = real_wcs_local
         stamp.setCenter(x_nominal, y_nominal)
         bounds = stamp.bounds & galsim.BoundsI(0, chip.npix_x - 1, 0, chip.npix_y - 1)
-        chip.img.setOrigin(0, 0)
-        stamp[bounds] = chip.img[bounds]
-
-        if not big_galaxy:
-            for i in range(len(photons_list)):
-                if i == 0:
-                    chip.sensor.accumulate(photons_list[i], stamp)
-                else:
-                    chip.sensor.accumulate(photons_list[i], stamp, resume=True)
+
+        if bounds.area() > 0:
+            chip.img.setOrigin(0, 0)
+            stamp[bounds] = chip.img[bounds]
+
+            if not big_galaxy:
+                for i in range(len(photons_list)):
+                    if i == 0:
+                        chip.sensor.accumulate(photons_list[i], stamp)
+                    else:
+                        chip.sensor.accumulate(photons_list[i], stamp, resume=True)
+            else:
+                sensor = galsim.Sensor()
+                for i in range(len(photons_list)):
+                    if i == 0:
+                        sensor.accumulate(photons_list[i], stamp)
+                    else:
+                        sensor.accumulate(photons_list[i], stamp, resume=True)
+                del sensor
+
+            chip.img[bounds] = stamp[bounds]
+
+            chip.img.setOrigin(chip.bound.xmin, chip.bound.ymin)
         else:
-            sensor = galsim.Sensor()
-            for i in range(len(photons_list)):
-                if i == 0:
-                    sensor.accumulate(photons_list[i], stamp)
-                else:
-                    sensor.accumulate(photons_list[i], stamp, resume=True)
-
-        chip.img[bounds] = stamp[bounds]
-
-        chip.img.setOrigin(chip.bound.xmin, chip.bound.ymin)
-
-
-
-        # stamp = galsim.ImageF(int(xmax*1.1), int(ymax*1.1))
-        # stamp.wcs = self.localWCS
-        # stamp.setCenter(self.x_nominal, self.y_nominal)
-        # bounds = stamp.bounds & chip.img.bounds
-        # stamp[bounds] = chip.img[bounds]
-        #
-        # if not big_galaxy:
-        #     for i in range(len(photons_list)):
-        #         if i == 0:
-        #             chip.sensor.accumulate(photons_list[i], stamp)
-        #         else:
-        #             chip.sensor.accumulate(photons_list[i], stamp, resume=True)
-        # else:
-        #     sensor = galsim.Sensor()
-        #     for i in range(len(photons_list)):
-        #         if i == 0:
-        #             sensor.accumulate(photons_list[i], stamp)
-        #         else:
-        #             sensor.accumulate(photons_list[i], stamp, resume=True)
-        #
-        # # print(stamp.array.sum())
-        # # chip.img[bounds] += stamp[bounds]
-        # chip.img[bounds] = stamp[bounds]
-        # # print("nphotons_sum = ", nphotons_sum)
+            # Return code 0: object photons missed this detector
+            print("obj %s missed"%(self.id))
+            self.logger.info("obj %s missed"%(self.id))
+            return 0, pos_shear
+        
+        # # [C6 TEST]
+        # print("nphotons_sum = ", nphotons_sum)
         del photons_list
         del stamp
-        return True, pos_shear
+        return 1, pos_shear
 
     def drawObj_slitless(self, tel, pos_img, psf_model, bandpass_list, filt, chip, nphotons_tot=None, g1=0, g2=0,
-                         exptime=150., normFilter=None, grating_split_pos=3685):
-
-        norm_thr_rang_ids = normFilter['SENSITIVITY'] > 0.001
-        sedNormFactor = getNormFactorForSpecWithABMAG(ABMag=self.param['mag_use_normal'], spectrum=self.sed,
-                                                      norm_thr=normFilter,
-                                                      sWave=np.floor(normFilter[norm_thr_rang_ids][0][0]),
-                                                      eWave=np.ceil(normFilter[norm_thr_rang_ids][-1][0]))
-        if sedNormFactor == 0:
-            return False
+                         exptime=150., normFilter=None, grating_split_pos=3685, fd_shear=None):
+        if normFilter is not None:
+            norm_thr_rang_ids = normFilter['SENSITIVITY'] > 0.001
+            sedNormFactor = getNormFactorForSpecWithABMAG(ABMag=self.param['mag_use_normal'], spectrum=self.sed,
+                                                        norm_thr=normFilter,
+                                                        sWave=np.floor(normFilter[norm_thr_rang_ids][0][0]),
+                                                        eWave=np.ceil(normFilter[norm_thr_rang_ids][-1][0]))
+            if sedNormFactor == 0:
+                return 2, None
+        else:
+            sedNormFactor = 1.
         normalSED = Table(np.array([self.sed['WAVELENGTH'], self.sed['FLUX'] * sedNormFactor]).T,
                           names=('WAVELENGTH', 'FLUX'))
 
@@ -262,7 +264,7 @@ class Galaxy(MockObject):
 
 
         big_galaxy = False
-        if self.hlr_disk > 3.0: # Very big galaxy
+        if self.hlr_disk > 3.0 or self.hlr_bulge > 3.0: # Very big galaxy
             big_galaxy = True
 
         if self.getMagFilter(filt) <= 15 and (not big_galaxy):
@@ -280,10 +282,10 @@ class Galaxy(MockObject):
             bandpass = bandpass_list[i]
 
             psf, pos_shear = psf_model.get_PSF(chip=chip, pos_img=pos_img, bandpass=bandpass, folding_threshold=folding_threshold)
-            disk = galsim.Sersic(n=1.0, half_light_radius=self.hlr_disk, flux=1.0, gsparams=gsp)
+            disk = galsim.Sersic(n=self.disk_sersic_idx, half_light_radius=self.hlr_disk, flux=1.0, gsparams=gsp)
             disk_shape = galsim.Shear(g1=self.e1_disk, g2=self.e2_disk)
             disk = disk.shear(disk_shape)
-            bulge = galsim.Sersic(n=4.0, half_light_radius=self.hlr_bulge, flux=1.0, gsparams=gsp)
+            bulge = galsim.Sersic(n=self.bulge_sersic_idx, half_light_radius=self.hlr_bulge, flux=1.0, gsparams=gsp)
             bulge_shape = galsim.Shear(g1=self.e1_bulge, g2=self.e2_bulge)
             bulge = bulge.shear(bulge_shape)
 
@@ -299,11 +301,16 @@ class Galaxy(MockObject):
             gal = gal.shear(gal_shear)
             gal = galsim.Convolve(psf, gal)
 
-            starImg = gal.drawImage(wcs=real_wcs_local)
+            if not big_galaxy: # Not apply PSF for very big galaxy
+                gal = galsim.Convolve(psf, gal)
+                if fd_shear is not None:
+                    gal = gal.shear(fd_shear)
+
+            starImg = gal.drawImage(wcs=real_wcs_local, offset=offset)
 
             origin_star = [y_nominal - (starImg.center.y - starImg.ymin),
                            x_nominal - (starImg.center.x - starImg.xmin)]
-
+            starImg.setOrigin(0, 0)
             gal_origin = [origin_star[0], origin_star[1]]
             gal_end = [origin_star[0] + starImg.array.shape[0] - 1, origin_star[1] + starImg.array.shape[1] - 1]
 
@@ -313,6 +320,7 @@ class Galaxy(MockObject):
 
                 subImg_p1 = starImg.array[:, 0:subSlitPos]
                 star_p1 = galsim.Image(subImg_p1)
+                star_p1.setOrigin(0, 0)
                 origin_p1 = origin_star
                 xcenter_p1 = min(x_nominal,grating_split_pos_chip-1) - 0
                 ycenter_p1 = y_nominal-0
@@ -329,6 +337,7 @@ class Galaxy(MockObject):
 
                 subImg_p2 = starImg.array[:, subSlitPos+1:starImg.array.shape[1]]
                 star_p2 = galsim.Image(subImg_p2)
+                star_p2.setOrigin(0, 0)
                 origin_p2 = [origin_star[0], grating_split_pos_chip]
                 xcenter_p2 = max(x_nominal, grating_split_pos_chip - 1) - 0
                 ycenter_p2 = y_nominal - 0
@@ -368,16 +377,16 @@ class Galaxy(MockObject):
 
             # print(self.y_nominal, starImg.center.y, starImg.ymin)
             del psf
-        return True, pos_shear
+        return 1, pos_shear
 
     def getGSObj(self, psf, g1=0, g2=0, flux=None, filt=None, tel=None, exptime=150.):
         if flux == None:
             flux = self.getElectronFluxFilt(filt, tel, exptime)
-        disk = galsim.Sersic(n=1.0, half_light_radius=self.hlr_disk, flux=1.0)
+        disk = galsim.Sersic(n=self.disk_sersic_idx, half_light_radius=self.hlr_disk, flux=1.0)
         disk_shape = galsim.Shear(g1=self.e1_disk, g2=self.e2_disk)
         disk = disk.shear(disk_shape)
 
-        bulge = galsim.Sersic(n=4.0, half_light_radius=self.hlr_bulge, flux=1.0)
+        bulge = galsim.Sersic(n=self.bulge_sersic_idx, half_light_radius=self.hlr_bulge, flux=1.0)
         bulge_shape = galsim.Shear(g1=self.e1_bulge, g2=self.e2_bulge)
         bulge = bulge.shear(bulge_shape)
 

ObservationSim/MockObject/MockObject.py

 import galsim
 import numpy as np
 import astropy.constants as cons
+from astropy import wcs
 from astropy.table import Table
 
 from ObservationSim.MockObject._util import magToFlux, VC_A, convolveGaussXorders
@@ -12,53 +13,36 @@ from ObservationSim.MockObject.SpecDisperser import SpecDisperser
 class MockObject(object):
     def __init__(self, param, logger=None):
         self.param = param
-
+        
+        for key in self.param:
+            setattr(self, key, self.param[key])
+        
         if self.param["star"] == 0:
             self.type = "galaxy"
         elif self.param["star"] == 1:
             self.type = "star"
         elif self.param["star"] == 2:
             self.type = "quasar"
+        ###mock_stamp_START
+        elif self.param["star"] == 3:
+            self.type = "stamp"
+        ###mock_stamp_END
 
-        self.id = self.param["id"]
-        self.ra = self.param["ra"]
-        self.dec = self.param["dec"]
-        self.ra_orig = self.param["ra_orig"]
-        self.dec_orig = self.param["dec_orig"]
-        self.z = self.param["z"]
-        self.sed_type = self.param["sed_type"]
-        self.model_tag = self.param["model_tag"]
-        self.mag_use_normal = self.param["mag_use_normal"]
         self.sed = None
 
         # Place holder for outputs
-        self.av = self.param["av"]
-        self.redden = self.param["redden"]
-        self.pmra = self.param["pmra"]
-        self.pmdec = self.param["pmdec"]
-        self.rv = self.param["rv"]
-        self.parallax = self.param["parallax"]
-        self.g1 = self.param["g1"]
-        self.g2 = self.param["g2"]
-        self.thetaR = self.param["theta"]
-        self.bfrac = self.param["bfrac"]
-        self.hlr_disk = self.param["hlr_disk"]
-        self.hlr_bulge = self.param["hlr_bulge"]
-        self.e1_disk, self.e2_disk = 0., 0.
-        self.e1_bulge, self.e2_bulge = 0., 0.
         self.additional_output_str = ""
+        self.fd_shear = None
 
         self.logger = logger
 
     def getMagFilter(self, filt):
         if filt.filter_type in ["GI", "GV", "GU"]:
             return self.param["mag_use_normal"]
-        return self.param["mag_%s" % filt.filter_type]
-        # (TEST) stamp size
-        # return 13.0
+        return self.param["mag_%s" % filt.filter_type.lower()]
 
     def getFluxFilter(self, filt):
-        return self.param["flux_%s" % filt.filter_type]
+        return self.param["flux_%s" % filt.filter_type.lower()]
 
     def getNumPhotons(self, flux, tel, exptime=150.):
         pupil_area = tel.pupil_area * (100.) ** 2  # m^2 to cm^2
@@ -85,7 +69,7 @@ class MockObject(object):
                 print("\n")
                 print("Before field distortion:\n")
                 print("x = %.2f, y = %.2f\n" % (self.posImg.x, self.posImg.y), flush=True)
-            self.posImg = fdmodel.get_Distorted(chip=chip, pos_img=self.posImg)
+            self.posImg, self.fd_shear = fdmodel.get_distorted(chip=chip, pos_img=self.posImg)
             if verbose:
                 print("After field distortion:\n")
                 print("x = %.2f, y = %.2f\n" % (self.posImg.x, self.posImg.y), flush=True)
@@ -96,14 +80,12 @@ class MockObject(object):
         dy = y - self.y_nominal
         self.offset = galsim.PositionD(dx, dy)
 
-        from astropy import wcs
-
         if img_header is not None:
             self.real_wcs = galsim.FitsWCS(header=img_header)
         else:
             self.real_wcs = None
 
-        return self.posImg, self.offset, self.localWCS, self.real_wcs
+        return self.posImg, self.offset, self.localWCS, self.real_wcs, self.fd_shear
 
     def getRealPos(self, img, global_x=0., global_y=0., img_real_wcs=None):
         img_global_pos = galsim.PositionD(global_x, global_y)
@@ -141,7 +123,7 @@ class MockObject(object):
         return img, stamp, isUpdated
 
     def drawObj_multiband(self, tel, pos_img, psf_model, bandpass_list, filt, chip, nphotons_tot=None, g1=0, g2=0,
-                          exptime=150.):
+                          exptime=150., fd_shear=None):
         if nphotons_tot == None:
             nphotons_tot = self.getElectronFluxFilt(filt, tel, exptime)
         # print("nphotons_tot = ", nphotons_tot)
@@ -151,7 +133,7 @@ class MockObject(object):
         except Exception as e:
             print(e)
             self.logger.error(e)
-            return False
+            return 2, None
 
         nphotons_sum = 0
         photons_list = []
@@ -201,14 +183,6 @@ class MockObject(object):
             star = star.withFlux(nphotons)
             star = galsim.Convolve(psf, star)
 
-            # stamp = star.drawImage(wcs=self.localWCS, method='phot', offset=self.offset, save_photons=True)
-            # xmax = max(xmax, stamp.xmax)
-            # ymax = max(ymax, stamp.ymax)
-            # photons = stamp.photons
-            # photons.x += self.x_nominal
-            # photons.y += self.y_nominal
-            # photons_list.append(photons)
-
             stamp = star.drawImage(wcs=real_wcs_local, method='phot', offset=offset, save_photons=True)
             xmax = max(xmax, stamp.xmax)
             ymax = max(ymax, stamp.ymax)
@@ -221,37 +195,31 @@ class MockObject(object):
         stamp.wcs = real_wcs_local
         stamp.setCenter(x_nominal, y_nominal)
         bounds = stamp.bounds & galsim.BoundsI(0, chip.npix_x - 1, 0, chip.npix_y - 1)
-        chip.img.setOrigin(0, 0)
-        stamp[bounds] = chip.img[bounds]
-        for i in range(len(photons_list)):
-            if i == 0:
-                chip.sensor.accumulate(photons_list[i], stamp)
-            else:
-                chip.sensor.accumulate(photons_list[i], stamp, resume=True)
-
-        chip.img[bounds] = stamp[bounds]
-
-        chip.img.setOrigin(chip.bound.xmin, chip.bound.ymin)
-        # Test stamp size
-        # print(xmax, ymax)
-
-        # stamp = galsim.ImageF(int(xmax*1.1), int(ymax*1.1))
-        # stamp.wcs = self.localWCS
-        # stamp.setCenter(self.x_nominal, self.y_nominal)
-        # bounds = stamp.bounds & chip.img.bounds
-        # stamp[bounds] = chip.img[bounds]
-        # for i in range(len(photons_list)):
-        #     if i == 0:
-        #         chip.sensor.accumulate(photons_list[i], stamp)
-        #     else:
-        #         chip.sensor.accumulate(photons_list[i], stamp, resume=True)
-        #
-        # chip.img[bounds] = stamp[bounds]
-        # print(chip.img.array.sum())
-        # print("nphotons_sum = ", nphotons_sum)
+        
+        # # (DEBUG)
+        # print("stamp bounds: ", stamp.bounds)
+        # print(bounds)
+        if bounds.area() > 0:
+            chip.img.setOrigin(0, 0)
+            stamp[bounds] = chip.img[bounds]
+            for i in range(len(photons_list)):
+                if i == 0:
+                    chip.sensor.accumulate(photons_list[i], stamp)
+                else:
+                    chip.sensor.accumulate(photons_list[i], stamp, resume=True)
+
+            chip.img[bounds] = stamp[bounds]
+
+            chip.img.setOrigin(chip.bound.xmin, chip.bound.ymin)
+        else:
+            # Return code 0: object photons missed this detector
+            print("obj %s missed"%(self.id))
+            self.logger.info("obj %s missed"%(self.id))
+            return 0, pos_shear
+
         del photons_list
         del stamp
-        return True, pos_shear
+        return 1, pos_shear # Return code 1: draw sucesss
 
     def addSLStoChipImage(self, sdp=None, chip=None, xOrderSigPlus=None, local_wcs=None):
         spec_orders = sdp.compute_spec_orders()
@@ -302,17 +270,18 @@ class MockObject(object):
         del spec_orders
 
     def drawObj_slitless(self, tel, pos_img, psf_model, bandpass_list, filt, chip, nphotons_tot=None, g1=0, g2=0,
-                         exptime=150., normFilter=None, grating_split_pos=3685):
-
-        norm_thr_rang_ids = normFilter['SENSITIVITY'] > 0.001
-        sedNormFactor = getNormFactorForSpecWithABMAG(ABMag=self.param['mag_use_normal'], spectrum=self.sed,
-                                                      norm_thr=normFilter,
-                                                      sWave=np.floor(normFilter[norm_thr_rang_ids][0][0]),
-                                                      eWave=np.ceil(normFilter[norm_thr_rang_ids][-1][0]))
-        # print(self.x_nominal, self.y_nominal, chip.bound)
-
-        if sedNormFactor == 0:
-            return False
+                         exptime=150., normFilter=None, grating_split_pos=3685, fd_shear=None):
+
+        if normFilter is not None:
+            norm_thr_rang_ids = normFilter['SENSITIVITY'] > 0.001
+            sedNormFactor = getNormFactorForSpecWithABMAG(ABMag=self.param['mag_use_normal'], spectrum=self.sed,
+                                                          norm_thr=normFilter,
+                                                          sWave=np.floor(normFilter[norm_thr_rang_ids][0][0]),
+                                                          eWave=np.ceil(normFilter[norm_thr_rang_ids][-1][0]))
+            if sedNormFactor == 0:
+                return 2, None
+        else:
+            sedNormFactor = 1.
 
         if self.getMagFilter(filt) <= 15:
             folding_threshold = 5.e-4
@@ -347,11 +316,12 @@ class MockObject(object):
             star = galsim.DeltaFunction(gsparams=gsp)
             star = star.withFlux(tel.pupil_area * exptime)
             star = galsim.Convolve(psf, star)
-            starImg = star.drawImage(nx=100, ny=100, wcs=real_wcs_local)
+            
+            starImg = star.drawImage(nx=100, ny=100, wcs=real_wcs_local, offset=offset)
 
             origin_star = [y_nominal - (starImg.center.y - starImg.ymin),
                            x_nominal - (starImg.center.x - starImg.xmin)]
-
+            starImg.setOrigin(0,0)
             gal_origin = [origin_star[0], origin_star[1]]
             gal_end = [origin_star[0] + starImg.array.shape[0] - 1, origin_star[1] + starImg.array.shape[1] - 1]
 
@@ -362,6 +332,7 @@ class MockObject(object):
                 subImg_p1 = starImg.array[:, 0:subSlitPos]
                 star_p1 = galsim.Image(subImg_p1)
                 origin_p1 = origin_star
+                star_p1.setOrigin(0,0)
                 xcenter_p1 = min(x_nominal, grating_split_pos_chip - 1) - 0
                 ycenter_p1 = y_nominal - 0
 
@@ -377,6 +348,7 @@ class MockObject(object):
 
                 subImg_p2 = starImg.array[:, subSlitPos + 1:starImg.array.shape[1]]
                 star_p2 = galsim.Image(subImg_p2)
+                star_p2.setOrigin(0, 0)
                 origin_p2 = [origin_star[0], grating_split_pos_chip]
                 xcenter_p2 = max(x_nominal, grating_split_pos_chip - 1) - 0
                 ycenter_p2 = y_nominal - 0
@@ -414,7 +386,7 @@ class MockObject(object):
                 self.addSLStoChipImage(sdp=sdp, chip=chip, xOrderSigPlus=xOrderSigPlus, local_wcs=real_wcs_local)
                 del sdp
             del psf
-        return True, pos_shear
+        return 1, pos_shear
 
     def SNRestimate(self, img_obj, flux, noise_level=0.0, seed=31415):
         img_flux = img_obj.added_flux
@@ -425,6 +397,3 @@ class MockObject(object):
         sig_obj = np.std(stamp.array)
         snr_obj = img_flux / sig_obj
         return snr_obj
-
-    # def getObservedEll(self, g1=0, g2=0):
-    #     return 0.0, 0.0, 0.0, 0.0, 0.0, 0.0