Commit 95bd043e authored by Wei Chengliang's avatar Wei Chengliang
Browse files

clean up log for missing objects

parent 366a61ad

observation_sim/config/ChipOutput.py

+2 −2
Original line number Diff line number Diff line
@@ -72,11 +72,11 @@ class ChipOutput(object): 
        self.logger.info("pointing_type = %s\n" % (self.pointing_type))



    def Log_info(self, message):

        print(message)

        # print(message)

        self.logger.info(message)



    def Log_error(self, message):

        print(message)

        # print(message)

        self.logger.error(message)



    def update_output_header(self, additional_column_names=""):

observation_sim/mock_objects/Galaxy.py

+3 −3
Original line number Diff line number Diff line
@@ -265,9 +265,9 @@ class Galaxy(MockObject): 


        if is_updated == 0:

            # Return code 0: object photons missed this detector

            print("obj %s missed" % (self.id))

            if self.logger:

                self.logger.info("obj %s missed" % (self.id))

            # print("obj %s missed" % (self.id))

            # if self.logger:

            #     self.logger.info("obj %s missed" % (self.id))

            return 0, pos_shear



        # # [C6 TEST]

observation_sim/mock_objects/MockObject.py

+3 −3
Original line number Diff line number Diff line
@@ -228,9 +228,9 @@ class MockObject(object): 


        if is_updated == 0:

            # Return code 0: object has missed this detector

            print("obj %s missed" % (self.id))

            if self.logger:

                self.logger.info("obj %s missed" % (self.id))

            # print("obj %s missed" % (self.id))

            # if self.logger:

            #     self.logger.info("obj %s missed" % (self.id))

            return 0, pos_shear

        return 1, pos_shear  # Return code 1: draw sucesss

observation_sim/sim_steps/add_objects.py

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ def add_objects(self, chip, filt, tel, pointing, catalog, obs_param): 
                "obj_ra = %.6f, obj_dec = %.6f, obj_ra_orig = %.6f, obj_dec_orig = %.6f"

                % (obj.ra, obj.dec, obj.ra_orig, obj.dec_orig)

            )

            self.chip_output.Log_error("Object missed: %s" % (obj.id))

            self.chip_output.Log_error("Object missed-998: %s" % (obj.id))

            missed_obj += 1

            obj.unload_SED()

            continue
@@ -294,7 +294,7 @@ def add_objects(self, chip, filt, tel, pointing, catalog, obs_param): 
                pass

            elif isUpdated == 0:

                missed_obj += 1

                self.chip_output.Log_error("Object missed: %s" % (obj.id))

                self.chip_output.Log_error("Object missed-999: %s" % (obj.id))

            else:

                self.chip_output.Log_error("Draw error, object omitted: %s" % (obj.id))

                continue