Updated example.yaml

pyobs · Aug 9, 2024 · de2a31d · de2a31d
1 parent 24a9850
commit de2a31d
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 30 deletions.
diff --git a/day_integration_test.yaml b/day_integration_test.yaml
@@ -44,7 +44,7 @@ modules:
             threshold: 3.5
 
           coverage_info:
-            zenith_range: 80
+            zenith_altitude: 80
 
     comm:
       class: pyobs.comm.local.LocalComm

diff --git a/example.yaml b/example.yaml
@@ -3,23 +3,6 @@ class: pyobs_cloudcover.application.Application
 # Camera which images are used for cloud detection
 image_sender: "allskycam"
 
-# Astronomical solution
-# Possible models:
-#   Simple Model
-#     class: pyobs_cloudcover.world_model.SimpleModel
-#     parameters: (a0, F, R, c_x, c_y) see https://ui.adsabs.harvard.edu/abs/2019A&A...626A.105B
-#   WCS Model
-#     class: pyobs_cloudcover.world_model.WCSModel
-#     parameters:
-#       file_path: Path to FITS file containing WCS
-model:
-  class: pyobs_cloudcover.world_model.SimpleModel
-  a0: 4.81426598e-03
-  F: 2.00000000e+00
-  R: 1.06352627e+03
-  c_x: 7.57115607e+02
-  c_y: 5.11194838e+02
-
 # Web Service
 server:
   # Host Name
@@ -37,13 +20,63 @@ measurement_log:
 # Different image analysis pipelines can be used for different solar altitude intervals
 # Currently only the "night" pipeline is available, which works best after the astronomical dawn
 pipelines:
+  day:
+    alt_interval:
+      start: 18
+      end:
+
+    options:
+      # Astronomical solution
+      # Possible models:
+      #   Simple Model
+      #     class: pyobs_cloudcover.world_model.SimpleModel
+      #     parameters: (a0, F, R, c_x, c_y) see https://ui.adsabs.harvard.edu/abs/2019A&A...626A.105B
+      #   WCS Model
+      #     class: pyobs_cloudcover.world_model.WCSModel
+      #     parameters:
+      #       file_path: Path to FITS file containing WCS
+      world_model:
+        class: pyobs_cloudcover.world_model.SimpleModel
+        a0: 4.81426598e-03
+        F: 2.00000000e+00
+        R: 1.06352627e+03
+        c_x: 7.57115607e+02
+        c_y: 5.11194838e+02
+
+      # Filepath to the image mask
+      mask_filepath: "data/mask.npy"
+
+      cloud_map:
+        # Under which color ratio a pixel is considered cloudy (blue/red + blue/green)
+        threshold: 3.5
+
+      coverage_info:
+        # Altitude which is considered to be the lower boundary of the zenith to average for the zenith cloud fraction measurement (in degree)
+        zenith_altitude: 80
   night:
     # Solar altitude interval (in degree), in which this pipeline should be used
     alt_interval:
       start:
       end: -18
 
     options:
+      # Astronomical solution
+      # Possible models:
+      #   Simple Model
+      #     class: pyobs_cloudcover.world_model.SimpleModel
+      #     parameters: (a0, F, R, c_x, c_y) see https://ui.adsabs.harvard.edu/abs/2019A&A...626A.105B
+      #   WCS Model
+      #     class: pyobs_cloudcover.world_model.WCSModel
+      #     parameters:
+      #       file_path: Path to FITS file containing WCS
+      world_model:
+        class: pyobs_cloudcover.world_model.SimpleModel
+        a0: 4.81426598e-03
+        F: 2.00000000e+00
+        R: 1.06352627e+03
+        c_x: 7.57115607e+02
+        c_y: 5.11194838e+02
+
       preprocessor:
         # Filepath to the image mask
         mask_filepath: "tests/integration/mask.npy"
@@ -72,14 +105,23 @@ pipelines:
         # Rectangle around the calculated star position with 2 * window_size + 1 length, in which the star searched for (in px)
         window_size: 6.0
 
-      cloud_map:
+      # Determines at which celestial positions the limiting magnitude is evaluated
+      altaz_grid:
+        # Number of equidistant points on the hole celestial sphere
+        point_number: 100000
+        # Lower boundary for altitude
+        limiting_altitude: 30
+
+      lim_mag_map:
         # Radius in which to use stars for estimating the limiting magnitude (in degree)
         radius: 7.0
         # Number of consecutive images in which a star has to be visible to be considered visible for the limiting magnitude estimation
         integration_length: 1
 
-      coverage_info:
+      cloud_map:
         # Under which limiting magnitude a pixel is considered cloudy (in mag)
-        cloud_threshold: 5.5
-        # Radius around the zenith to average for the zenith cloud fraction measurement (in degree)
-        zenith_radius: 20
+        threshold: 5.5
+
+      coverage_info:
+        # Altitude which is considered to be the lower boundary of the zenith to average for the zenith cloud fraction measurement (in degree)
+        zenith_altitude: 80
diff --git a/night_integration_test.yaml b/night_integration_test.yaml
@@ -58,7 +58,7 @@ modules:
             threshold: 5.5
 
           coverage_info:
-            zenith_range: 80
+            zenith_altitude: 80
 
     comm:
       class: pyobs.comm.local.LocalComm

diff --git a/pyobs_cloudcover/cloud_info_calculator/cloud_info_calculator_factory.py b/pyobs_cloudcover/cloud_info_calculator/cloud_info_calculator_factory.py
@@ -12,7 +12,7 @@ def __init__(self, options: CloudInfoCalculatorOptions):
 
     def __call__(self) -> CoverageInfoCalculator:
         coverage_change_calculator = CoverageChangeCalculator()
-        zenith_masker = ZenithCloudCoverageCalculator(self._options.zenith_range)
+        zenith_masker = ZenithCloudCoverageCalculator(self._options.zenith_altitude)
         cloud_coverage_info_calculator = CoverageInfoCalculator(coverage_change_calculator, zenith_masker)
 
         return cloud_coverage_info_calculator
diff --git a/pyobs_cloudcover/cloud_info_calculator/cloud_info_calculator_options.py b/pyobs_cloudcover/cloud_info_calculator/cloud_info_calculator_options.py
@@ -4,8 +4,8 @@
 
 
 class CloudInfoCalculatorOptions(object):
-    def __init__(self, zenith_range: float) -> None:
-        self.zenith_range = zenith_range
+    def __init__(self, zenith_altitude: float) -> None:
+        self.zenith_altitude = zenith_altitude
 
     @classmethod
     def from_dict(cls, options: Dict[str, Any]) -> CloudInfoCalculatorOptions:

diff --git a/tests/integration/test_day_pipeline_factory.py b/tests/integration/test_day_pipeline_factory.py
@@ -35,7 +35,7 @@ def test_day_pipeline() -> None:
             "threshold": 3.5
         },
         "coverage_info": {
-            "zenith_range": 80
+            "zenith_altitude": 80
         }
     }
 

diff --git a/tests/integration/test_night_pipeline_factory.py b/tests/integration/test_night_pipeline_factory.py
@@ -57,7 +57,7 @@ def test_night_pipeline() -> None:
             "threshold": 0.5
         },
         "coverage_info": {
-            "zenith_range": 80
+            "zenith_altitude": 80
         }
     }
 

diff --git a/tests/integration/test_pipeline_controller.py b/tests/integration/test_pipeline_controller.py
@@ -64,7 +64,7 @@ def test_night_pipeline() -> None:
                             "threshold": 0.5
                         },
                         "coverage_info": {
-                            "zenith_range": 80
+                            "zenith_altitude": 80
                         }
                     }
             }