refactor yaml file names to be more accurate

deepskies · Sep 23, 2024 · 06cc0b4 · 06cc0b4
1 parent 74f99b7
commit 06cc0b4
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 62 deletions.
diff --git a/deepszsim/Settings/config_demo.yaml b/deepszsim/Settings/config_demo.yaml
diff --git a/deepszsim/Settings/config_everything.yaml b/deepszsim/Settings/config_everything.yaml
@@ -1,4 +1,14 @@
 COSMOLOGY:
+  Planck2018: #https://arxiv.org/abs/1807.06209:
+    flat: True 
+    H0: 67.4
+    Omega_m0: 0.315
+    Omega_b0: 0.049
+    Omega_d0: 0.636
+    sigma8: 0.83
+    ns: 0.965
+    cosmo_h: 0.674
+    t_cmb: 2.725 #K
   Battaglia2012:
     flat: True 
     H0: 70
@@ -10,14 +20,35 @@ COSMOLOGY:
     t_cmb: 2.725 #K
 
 SURVEYS:
+  ACTDR4: #https://arxiv.org/pdf/2007.07290
+    90: #Observation frequency [GHz]
+      beam_size: 2.1 #From published survey properties 
+      noise_level: 100 #From published survey properties 
+    150: #Observation frequency [GHz]
+      beam_size: 1.4 #From published survey properties 
+      noise_level: 75 #From published survey properties 
+    220: #Observation frequency [GHz]
+      beam_size: 1.05 #From published survey properties
+      noise_level: 41 #From published survey properties
   ACTDR5:
+    90: #Observation frequency [GHz]
+      beam_size: 2.1 #From published survey properties
+      noise_level: 40 #From published survey properties
     150: #Observation frequency [GHz]
-      beam_size: 1.4 #From published survey properties
-      noise_level: 8 #[uK/arcmin]
+      beam_size: 1.3 #From published survey properties
+      noise_level: 30 #From published survey properties
+    220: #Observation frequency [GHz]
+      beam_size: 1.0 #From published survey properties
+      noise_level: 125 #From published survey properties
+  SPT: #https://arxiv.org/pdf/1111.7245
+    150: #Observation frequency [GHz]
+      beam_size: 1.15 #From published survey properties
+      noise_level: 17 #From published survey properties
 
 IMAGES:
-  image_size_pixels: 41
-  pixel_size_arcmin: 0.5
-
+  image_size: 37
+  pixel_scale: 0.5
 
+
+#SEED: need to put this in
 
diff --git a/deepszsim/Settings/config_simACTDR5.yaml b/deepszsim/Settings/config_simACTDR5.yaml
@@ -0,0 +1,23 @@
+COSMOLOGY:
+  Battaglia2012:
+    flat: True 
+    H0: 70
+    Omega_m0: 0.25
+    Omega_b0: 0.043
+    sigma8: 0.8
+    ns: 0.96
+    cosmo_h: 0.7
+    t_cmb: 2.725 #K
+
+SURVEYS:
+  ACTDR5:
+    150: #Observation frequency [GHz]
+      beam_size: 1.4 #From published survey properties
+      noise_level: 8 #[uK/arcmin]
+
+IMAGES:
+  image_size_pixels: 41
+  pixel_size_arcmin: 0.5
+
+
+
diff --git a/deepszsim/load_vars.py b/deepszsim/load_vars.py
@@ -10,7 +10,7 @@
 import sys
 import h5py
 
-def load_vars(file_name= "config_everything.yaml",
+def load_vars(file_name= "config_simACTDR5.yaml",
               file_dir = os.path.join(os.path.dirname(__file__), "Settings"),
               survey_num : int = None,
               survey_name : str = None,

diff --git a/deepszsim/read_yaml.py b/deepszsim/read_yaml.py
@@ -8,7 +8,7 @@
 
 class YAMLOperator:
 
-    def __init__(self, file_path=os.path.join(os.path.dirname(__file__), "Settings", "config_everything.yaml")):
+    def __init__(self, file_path=os.path.join(os.path.dirname(__file__), "Settings", "config_simACTDR5.yaml")):
 
         self.file_path = file_path
 

diff --git a/deepszsim/simclusters.py b/deepszsim/simclusters.py
@@ -13,7 +13,7 @@ def __init__(self, M200 = None, redshift_z = None, num_halos = None, halo_params
                  R200_Mpc = None, profile = "Battaglia2012",
                  image_size_pixels = None, image_size_arcmin = None, pixel_size_arcmin = None,
                  alpha = 1.0, gamma = -0.3,
-                 load_vars_yaml = os.path.join(os.path.dirname(__file__), 'Settings', 'config_everything.yaml'),
+                 load_vars_yaml = os.path.join(os.path.dirname(__file__), 'Settings', 'config_simACTDR5.yaml'),
                  seed = None, tqverb = False
                  ):
         """