Commit bb11d56d authored by Wei Chengliang's avatar Wei Chengliang
Browse files

optimize stdout log

parent 3f5a4c64

observation_sim/ObservationSim.py

+19 −14
Original line number Diff line number Diff line
@@ -118,25 +118,27 @@ class Observation(object): 
    ):



        chip_output.Log_info(

            ":::::::::::::::::::Current Pointing Information::::::::::::::::::"

            ":::::::::::::::::::Current Pointing Information::::::::::::::::::", stdout=True

        )

        chip_output.Log_info("RA: %f, DEC; %f" % (pointing.ra, pointing.dec))

        chip_output.Log_info("RA: %f, DEC; %f" % (pointing.ra, pointing.dec), stdout=True)

        chip_output.Log_info(

            "Time: %s" % datetime.utcfromtimestamp(pointing.timestamp).isoformat()

            "Time: %s" % datetime.utcfromtimestamp(pointing.timestamp).isoformat(), stdout=True

        )

        chip_output.Log_info("Exposure time: %f" % pointing.exp_time)

        chip_output.Log_info("Exposure time: %f" % pointing.exp_time, stdout=True)

        chip_output.Log_info(

            "Satellite Position (x, y, z): (%f, %f, %f)"

            % (pointing.sat_x, pointing.sat_y, pointing.sat_z)

            % (pointing.sat_x, pointing.sat_y, pointing.sat_z),

            stdout=True

        )

        chip_output.Log_info(

            "Satellite Velocity (x, y, z): (%f, %f, %f)"

            % (pointing.sat_vx, pointing.sat_vy, pointing.sat_vz)

            % (pointing.sat_vx, pointing.sat_vy, pointing.sat_vz),

            stdout=True

        )

        chip_output.Log_info("Position Angle: %f" % pointing.img_pa.deg)

        chip_output.Log_info("Chip : %d" % chip.chipID)

        chip_output.Log_info("Position Angle: %f" % pointing.img_pa.deg, stdout=True)

        chip_output.Log_info("Chip : %d" % chip.chipID, stdout=True)

        chip_output.Log_info(

            ":::::::::::::::::::::::::::END:::::::::::::::::::::::::::::::::::"

            ":::::::::::::::::::::::::::END:::::::::::::::::::::::::::::::::::", stdout=True

        )



        # Apply astrometric simulation for pointing
@@ -189,7 +191,8 @@ class Observation(object): 
                    continue

            chip_output.Log_info(

                "Starting simulation step: %s, calling function: %s"

                % (step, SIM_STEP_TYPES[step])

                % (step, SIM_STEP_TYPES[step]),

                stdout=True

            )

            obs_param = pointing.obs_param["call_sequence"][step]

            step_name = SIM_STEP_TYPES[step]
@@ -203,7 +206,7 @@ class Observation(object): 
                    catalog=self.Catalog,

                    obs_param=obs_param,

                )

                chip_output.Log_info("Finished simulation step: %s" % (step))

                chip_output.Log_info("Finished simulation step: %s" % (step), stdout=True)

            except Exception as e:

                traceback.print_exc()

                chip_output.Log_error(e)
@@ -220,7 +223,8 @@ class Observation(object): 
                chip.chipID,

                os.getpid(),

                (psutil.Process(os.getpid()).memory_info().rss / 1024 / 1024 / 1024),

            )

            ),

            stdout=True

        )



    def runExposure_MPI_PointingList(self, pointing_list, chips=None):
@@ -314,12 +318,13 @@ class Observation(object): 
                )

                chip_output.Log_info(

                    "running pointing#%d, chip#%d, at PID#%d..."

                    % (int(pointing_ID), chip.chipID, pid)

                    % (int(pointing_ID), chip.chipID, pid),

                    stdout=True

                )

                self.run_one_chip(

                    chip=chip, filt=filt, chip_output=chip_output, pointing=pointing

                )

                chip_output.Log_info("finished running chip#%d..." % (chip.chipID))

                chip_output.Log_info("finished running chip#%d..." % (chip.chipID), stdout=True)

                for handler in chip_output.logger.handlers[:]:

                    chip_output.logger.removeHandler(handler)

                del chip_output

observation_sim/config/ChipOutput.py

+6 −4
Original line number Diff line number Diff line
@@ -71,12 +71,14 @@ class ChipOutput(object): 


        self.logger.info("pointing_type = %s\n" % (self.pointing_type))



    def Log_info(self, message):

        # print(message)

    def Log_info(self, message, stdout=False):

        if stdout:

            print(message)

        self.logger.info(message)



    def Log_error(self, message):

        # print(message)

    def Log_error(self, message, stderr=False):

        if stderr:

            print(message)

        self.logger.error(message)



    def update_output_header(self, additional_column_names=""):