diff --git a/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST1.txt b/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST1.txt index 03b6a04..929afb4 100644 --- a/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST1.txt +++ b/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST1.txt @@ -1,4 +1,4 @@ -Time[UTC] RA(deg) DEC(deg) PGW Pgal Round ObsName Duration FoV +Time[UTC] RA(deg) DEC(deg) PGW Round ObsName Duration FoV "2023-10-12 20:42:18" 29.8828 19.4712 0.0943 1 LST1 15 2.5 "2023-10-12 20:57:18" 32.3438 15.4041 0.0591 1 LST1 15 2.5 "2023-10-12 21:12:18" 37.9688 22.9934 0.0365 1 LST1 15 2.5 diff --git a/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST2.txt b/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST2.txt index 2e85689..2e3acc7 100644 --- a/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST2.txt +++ b/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST2.txt @@ -1,4 +1,4 @@ -Time[UTC] RA(deg) DEC(deg) PGW Pgal Round ObsName Duration FoV +Time[UTC] RA(deg) DEC(deg) PGW Round ObsName Duration FoV "2023-10-12 20:42:18" 27.0703 15.7139 0.0661 1 LST2 15 2.5 "2023-10-12 20:57:18" 34.4531 19.155 0.0533 1 LST2 15 2.5 "2023-10-12 21:12:18" 22.5 16.646 0.0337 1 LST2 15 2.5 diff --git a/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST3.txt b/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST3.txt index ac68d53..8f7aa30 100644 --- a/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST3.txt +++ b/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST3.txt @@ -1,4 +1,4 @@ -Time[UTC] RA(deg) DEC(deg) PGW Pgal Round ObsName Duration FoV +Time[UTC] RA(deg) DEC(deg) PGW Round ObsName Duration FoV "2023-10-12 20:42:18" 32.6953 23.318 0.0646 1 LST3 15 2.5 "2023-10-12 20:57:18" 27.7734 23.9695 0.049 1 LST3 15 2.5 "2023-10-12 21:12:18" 24.2578 12.0247 0.0308 1 LST3 15 2.5 diff --git a/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST4.txt b/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST4.txt index 9418a4f..76b6261 100644 --- a/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST4.txt +++ b/examples/sciencecases/bn231012231/PGWinFoV_NObs/SuggestedPointings_GWOptimisation_LST4.txt @@ -1,4 +1,4 @@ -Time[UTC] RA(deg) DEC(deg) PGW Pgal Round ObsName Duration FoV +Time[UTC] RA(deg) DEC(deg) PGW Round ObsName Duration FoV "2023-10-12 20:42:18" 25.3125 20.4236 0.0573 1 LST4 15 2.5 "2023-10-12 20:57:18" 29.1797 11.4152 0.0385 1 LST4 15 2.5 "2023-10-12 21:12:18" 35.5078 27.2796 0.0252 1 LST4 15 2.5 diff --git a/pyproject.toml b/pyproject.toml index bf832c6..af464a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,6 +66,7 @@ all = [ [project.scripts] Tiling_Observations = "tilepy.scripts.Tiling_Observations:main" +PlottingTwoCampaigns = "tilepy.scripts.PlottingTwoCampaigns:main" [project.urls] repository = "https://github.com/astro-transients/tilepy" diff --git a/src/tilepy/scripts/__init__.py b/src/tilepy/scripts/__init__.py index 725327d..7192bdf 100644 --- a/src/tilepy/scripts/__init__.py +++ b/src/tilepy/scripts/__init__.py @@ -1,5 +1,7 @@ from .Tiling_Observations import Tiling_Observations +from .PlottingTwoCampaigns import PlottingTwoCampaigns __all__ = [ - "Tiling_Observations" + "Tiling_Observations", + "PlottingTwoCampaigns", ] \ No newline at end of file diff --git a/src/tilepy/tools/VisualizationTools.py b/src/tilepy/tools/VisualizationTools.py index a46a448..644b2fc 100644 --- a/src/tilepy/tools/VisualizationTools.py +++ b/src/tilepy/tools/VisualizationTools.py @@ -209,12 +209,16 @@ def CompareTwoTilings(filename, PointingsFile1=False, PointingsFile2=False, FOV= df1 = LoadPointings (PointingsFile1) df2 = LoadPointings (PointingsFile2) - + if 'Pgal' in df2.columns: print('Summary of 1st file: sum(PW)=', sum(df1['PGW']), 'sum(PGAL)=', sum(df1['Pgal']), 'total pointings', len(df1['PGW'])) print('Summary of 2st file: sum(PW)=', sum(df2['PGW']), 'sum(PGAL)=', sum(df2['Pgal']), 'total pointings', len(df2['PGW'])) print("===========================================================================================") + else: + print('Summary of 1st file: sum(PW)=', sum(df1['PGW']),'total pointings', len(df1['PGW'])) + print('Summary of 2st file: sum(PW)=', sum(df2['PGW']),'total pointings', len(df2['PGW'])) + print("===========================================================================================") name1 = 'File1' name2 = 'File2'