Merge pull request #750 from dirac-institute/repo_cleanup

remove ./data/camera file

demo/PPConfig_test.ini

@@ -57,8 +57,10 @@ phase_function = HG
 # Options: circle, footprint.
 camera_model = footprint
 
-# Path to camera footprint file. Comment out if using circle footprint.
-footprint_path= ./data/detectors_corners.csv
+# Path to camera footprint file. Uncomment to provide a path to the desired camera 
+# detector configurationn file if not using the default built-in LSSTCam detector 
+# configuration or not using the circle footprint model.
+# footprint_path= ./data/detectors_corners.csv
 
 # Fraction of detector surface area which contains CCD -- simulates chip gaps
 # for OIF output. Comment out if using camera footprint.

demo/config_for_ephemeris_unit_test.ini

@@ -87,8 +87,10 @@ phase_function = HG
 # Options: circle, footprint.
 camera_model = footprint
 
-# Path to camera footprint file. Comment out if using circle footprint.
-footprint_path= ./data/detectors_corners.csv
+# Path to camera footprint file. Uncomment to provide a path to the desired camera 
+# detector configurationn file if not using the default built-in LSSTCam detector 
+# configuration or not using the circle footprint model.
+# footprint_path= ./data/detectors_corners.csv
 
 # Fraction of detector surface area which contains CCD -- simulates chip gaps
 # for OIF output. Comment out if using camera footprint.

demo/sorcha_config_demo.ini

@@ -79,8 +79,10 @@ phase_function = HG
 # Options: circle, footprint.
 camera_model = footprint
 
-# Path to camera footprint file. Comment out if using circle footprint.
-footprint_path= ./data/detectors_corners.csv
+# Path to camera footprint file. Uncomment to provide a path to the desired camera 
+# detector configurationn file if not using the default built-in LSSTCam detector 
+# configuration or not using the circle footprint model.
+# footprint_path= ./data/detectors_corners.csv
 
 # Fraction of detector surface area which contains CCD -- simulates chip gaps
 # for OIF output. Comment out if using camera footprint.

demo/test_bench_config.ini

@@ -58,8 +58,10 @@ phase_function = HG
 # Options: circle, footprint.
 camera_model = footprint
 
-# Path to camera footprint file. Comment out if using circle footprint.
-footprint_path= ./data/detectors_corners.csv
+# Path to camera footprint file. Uncomment to provide a path to the desired camera 
+# detector configurationn file if not using the default built-in LSSTCam detector 
+# configuration or not using the circle footprint model.
+# footprint_path= ./data/detectors_corners.csv
 
 # Fraction of detector surface area which contains CCD -- simulates chip gaps
 # for OIF output. Comment out if using camera footprint.

src/sorcha/modules/PPFootprintFilter.py

@@ -398,10 +398,15 @@ def __init__(self, path=None, detectorName="detector"):
         # the center of the camera should be the origin
         # if the user doesn't provide their own version of the footprint,
         # we'll use the default LSST version that comes included.
+        pplogger = logging.getLogger(__name__)
+
         if path:
             allcornersdf = pd.read_csv(path)
+            pplogger.info(f"Using CCD Detector file: {path}")
         else:
-            stream = pkg_resources.resource_stream(__name__, "data/LSST_detector_corners_100123.csv")
+            default_camera_config_file = "data/LSST_detector_corners_100123.csv"
+            stream = pkg_resources.resource_stream(__name__, default_camera_config_file)
+            pplogger.info(f"Using built-in CCD Detector file: {default_camera_config_file}")
             allcornersdf = pd.read_csv(stream)
 
         # build dictionary of detectorName:[list_of_inds]

survey_setups/Rubin_full_footprint.ini

@@ -81,8 +81,10 @@ camera_model = footprint
 # at which we will not correctly extract an object.
 # footprint_edge_threshold = 0.0001
 
-# Path to camera footprint file. Comment out if using circle footprint.
-footprint_path= ./data/detectors_corners.csv
+# Path to camera footprint file. Uncomment to provide a path to the desired camera 
+# detector configurationn file if not using the default built-in LSSTCam detector 
+# configuration or not using the circle footprint model.
+# footprint_path= ./data/detectors_corners.csv
 
 [FADINGFUNCTION]