Update CI and example

planck-npipe · Aug 18, 2023 · 9f40bd1 · 9f40bd1
1 parent de2baac
commit 9f40bd1
Show file tree

Hide file tree

Showing 9 changed files with 165 additions and 145 deletions.
diff --git a/examples/hillipop_example.yaml b/examples/hillipop_example.yaml
@@ -10,14 +10,12 @@ params:
       min: 0.0103
       max: 0.0105
     proposal: 1.5e-6
-    latex: \theta_\mathrm{MC}
   logA:
     prior:
       min: 2.6
       max: 3.5
     proposal: 0.0036
     drop: True
-    latex: \log(10^{10} A_\mathrm{s})
   As:
     value: "lambda logA: 1e-10*np.exp(logA)"
     latex: A_\mathrm{s}
@@ -26,36 +24,32 @@ params:
       min: 0.9
       max: 1.1
     proposal: 0.0033
-    latex: n_\mathrm{s}
   ombh2:
     prior:
       min: 0.017
       max: 0.027
     proposal: 6.5e-5
-    latex: \Omega_\mathrm{b}h^2
   omch2:
     prior:
       min: 0.09
       max: 0.15
     proposal: 0.0011
-    latex: \Omega_\mathrm{c}h^2
   Alens:
     prior:
       min: 0.5
       max: 1.5
     proposal: 0.022
-    latex: A_\mathrm{L}
   tau:
     prior:
       dist: norm
       loc: 0.0544
       scale: 0.0073
     proposal: 0.0073
-    latex: \tau_\mathrm{reio}
+
+  # Derived Parameters
   H0:
-    latex: H_0
+
   sigma8:
-    latex: \sigma_8
 
   # Nuisance Parameters
   A_planck:
@@ -64,110 +58,123 @@ params:
       loc: 1.0
       scale: 0.0025
     proposal: 0.001
-    latex: A_\mathrm{planck}
   cal100A:
     prior:
-      dist: norm
-      loc: 0.0
-      scale: 0.002
-    proposal: 0.001
-    latex: cal_\mathrm{100A}
+      min: 0.9
+      max: 1.1
+    ref: 1.0
+    proposal: 0.005
   cal100B:
     prior:
-      dist: norm
-      loc: 0.0
-      scale: 0.002
-    proposal: 0.001
-    latex: cal_\mathrm{100B}
+      min: 0.9
+      max: 1.1
+    ref: 1.0
+    proposal: 0.005
   cal143A:
-    value: 0.0
-    latex: cal_\mathrm{143A}
+    value: 1.0
   cal143B:
     prior:
-      dist: norm
-      loc: 0.0
-      scale: 0.002
-    proposal: 0.001
-    latex: cal_\mathrm{143B}
+      min: 0.9
+      max: 1.1
+    ref: 1.0
+    proposal: 0.005
   cal217A:
     prior:
-      dist: norm
-      loc: 0.0
-      scale: 0.002
-    proposal: 0.001
-    latex: cal_\mathrm{217A}
+      min: 0.9
+      max: 1.1
+    ref: 1.0
+    proposal: 0.005
   cal217B:
     prior:
-      dist: norm
-      loc: 0.0
-      scale: 0.002
-    proposal: 0.001
-    latex: cal_\mathrm{217B}
+      min: 0.9
+      max: 1.1
+    ref: 1.0
+    proposal: 0.005
 
-  # Foregound parameters
+  #Point Sources models
   Aradio:
     prior:
-      dist: norm
-      loc: 1.61984
-      scale: 0.2
-    proposal: 0.1
-    latex: A_\mathrm{radio}^\mathrm{PS}
+      min: 0.
+      max: 150.
+    ref: 60.
+    proposal: 1.
+  beta_radio:
+    value: -0.8
   Adusty:
     prior:
-      dist: norm
-      loc: 0.781192
-      scale: 0.2
-    proposal: 0.1
-    latex: A_\mathrm{dust}^\mathrm{PS}
-  AdustTT:
+      min: 0.
+      max: 100.
+    ref: 6.
+    proposal: 1.
+  beta_dusty:
+    value: "lambda beta_cib: beta_cib"
+
+  #Dust model
+  AdustT:
     prior:
       dist: norm
       loc: 1.0
-      scale: 0.2
-    proposal: 0.1
-    latex: A_\mathrm{dust}^\mathrm{TT}
-  AdustPP:
+      scale: 0.1
+    ref: 1.0
+    proposal: 0.02
+  beta_dustT:
     prior:
       dist: norm
-      loc: 1.0
-      scale: 0.2
-    proposal: 0.1
-    latex: A_\mathrm{dust}^\mathrm{PP}
-  AdustTP:
+      loc: 1.51
+      scale: 0.01
+    ref: 1.51
+    proposal: 0.01
+  AdustP:
     prior:
       dist: norm
       loc: 1.0
-      scale: 0.2
-    proposal: 0.1
-    latex: A_\mathrm{dust}^\mathrm{TP}
-  Asz:
+      scale: 0.1
+    ref: 1.0
+    proposal: 0.02
+  beta_dustP:
     prior:
       dist: norm
-      loc: 1.0
-      scale: 0.2
-    proposal: 0.1
-    latex: A_\mathrm{SZ}
+      loc: 1.59
+      scale: 0.01
+    ref: 1.59
+    proposal: 0.01
+
+  #Cosmic Infrared Background
   Acib:
+    prior:
+      min: 0.
+      max: 20.
+    ref: 4.0
+    proposal: 1
+  beta_cib:
     prior:
       dist: norm
-      loc: 1.0
-      scale: 0.2
-    proposal: 0.1
-    latex: A_\mathrm{CIB}
-  Aksz:
+      loc: 1.75
+      scale: 0.06
+    ref: 1.75
+    proposal: 0.05
+
+  #Sunyaev-Zeldovich
+  Atsz:
     prior:
-      min: 0
-      max: 10
-    ref: 0.6
+      min: 0.
+      max: 50.
+    ref: 3.0
     proposal: 1
-    latex: A_\mathrm{kSZ}
-  Aszxcib:
+  Aksz:
     prior:
       min: 0
-      max: 10
-    ref: 1.0
+      max: 50
+    ref: 1.
     proposal: 1
-    latex: A_\mathrm{SZxCIB}
+
+  #tSZxCIB
+  xi:
+    prior:
+      min: -1.
+      max: 1.
+    ref: 0.1
+    proposal: 0.1
 
 theory:
   camb:
@@ -176,6 +183,6 @@ theory:
       lens_potential_accuracy: 1
 
 sampler:
-  mcmc:
+  evaluate:
 
 output: chains/mcmc
diff --git a/planck_2020_hillipop/EE.yaml b/planck_2020_hillipop/EE.yaml
@@ -1,7 +1,7 @@
 data_folder: planck_2020/hillipop
-multipoles_range_file: data/binning_ext.fits
-xspectra_basename: data/cross_NPIPE_detset
-covariance_matrix_file: data/invfll_NPIPE_detset_ext_EE.fits
+multipoles_range_file: data/binning_v4.2.fits
+xspectra_basename: data/dl_PR4_v4.2
+covariance_matrix_file: data/invfll_PR4_v4.2_EE.fits
 
 foregrounds: !defaults [foregrounds]
 

diff --git a/planck_2020_hillipop/TE.yaml b/planck_2020_hillipop/TE.yaml
@@ -1,7 +1,7 @@
 data_folder: planck_2020/hillipop
-multipoles_range_file: data/binning_ext.fits
-xspectra_basename: data/cross_NPIPE_detset
-covariance_matrix_file: data/invfll_NPIPE_detset_ext_TE.fits
+multipoles_range_file: data/binning_v4.2.fits
+xspectra_basename: data/dl_PR4_v4.2
+covariance_matrix_file: data/invfll_PR4_v4.2_TE.fits
 
 foregrounds: !defaults [foregrounds]
 

diff --git a/planck_2020_hillipop/TT.yaml b/planck_2020_hillipop/TT.yaml
@@ -1,7 +1,7 @@
 data_folder: planck_2020/hillipop
-multipoles_range_file: data/binning_ext.fits
-xspectra_basename: data/cross_NPIPE_detset
-covariance_matrix_file: data/invfll_NPIPE_detset_ext_TT.fits
+multipoles_range_file: data/binning_v4.2.fits
+xspectra_basename: data/dl_PR4_v4.2
+covariance_matrix_file: data/invfll_PR4_v4.2_TT.fits
 
 foregrounds: !defaults [foregrounds]
 

diff --git a/planck_2020_hillipop/TTTEEE.yaml b/planck_2020_hillipop/TTTEEE.yaml
@@ -1,7 +1,7 @@
 data_folder: planck_2020/hillipop
-multipoles_range_file: data/binning_ext.fits
-xspectra_basename: data/cross_NPIPE_detset
-covariance_matrix_file: data/invfll_NPIPE_detset_ext_TTTEEE.fits
+multipoles_range_file: data/binning_v4.2.fits
+xspectra_basename: data/dl_PR4_v4.2
+covariance_matrix_file: data/invfll_PR4_v4.2_TTTEEE.fits
 
 foregrounds: !defaults [foregrounds]
 

diff --git a/planck_2020_hillipop/params_EE.yaml b/planck_2020_hillipop/params_EE.yaml
@@ -11,14 +11,20 @@
 
   #Dust model
   AdustP:
-    value: 1.0
+    prior:
+      dist: norm
+      loc: 1.0
+      scale: 0.1
+    ref: 1.0
+    proposal: 0.02
     latex: A_\mathrm{dustP}
   beta_dustP:
     prior:
-      min: 1.
-      max: 3.
+      dist: norm
+      loc: 1.59
+      scale: 0.01
     ref: 1.59
-    proposal: 0.05
+    proposal: 0.01
     latex: \beta_\mathrm{dustP}
 
   #Sync

diff --git a/planck_2020_hillipop/params_TE.yaml b/planck_2020_hillipop/params_TE.yaml
@@ -1,23 +1,35 @@
   #Dust model
   AdustT:
-    value: 1.0
+    prior:
+      dist: norm
+      loc: 1.0
+      scale: 0.1
+    ref: 1.0
+    proposal: 0.02
     latex: A_\mathrm{dustT}
-  AdustP:
-    value: 1.0
-    latex: A_\mathrm{dustP}
   beta_dustT:
     prior:
-      min: 1.
-      max: 3.
+      dist: norm
+      loc: 1.51
+      scale: 0.01
     ref: 1.51
-    proposal: 0.05
+    proposal: 0.01
     latex: \beta_\mathrm{dustT}
+  AdustP:
+    prior:
+      dist: norm
+      loc: 1.0
+      scale: 0.1
+    ref: 1.0
+    proposal: 0.02
+    latex: A_\mathrm{dustP}
   beta_dustP:
     prior:
-      min: 1.
-      max: 3.
+      dist: norm
+      loc: 1.59
+      scale: 0.01
     ref: 1.59
-    proposal: 0.05
+    proposal: 0.01
     latex: \beta_\mathrm{dustP}
 
   Ad100T:

diff --git a/planck_2020_hillipop/params_TT.yaml b/planck_2020_hillipop/params_TT.yaml
@@ -42,14 +42,20 @@
 
   #Dust model
   AdustT:
-    value: 1.0
+    prior:
+      dist: norm
+      loc: 1.0
+      scale: 0.1
+    ref: 1.0
+    proposal: 0.02
     latex: A_\mathrm{dustT}
   beta_dustT:
     prior:
-      min: 1.
-      max: 3.
+      dist: norm
+      loc: 1.51
+      scale: 0.01
     ref: 1.51
-    proposal: 0.05
+    proposal: 0.01
     latex: \beta_\mathrm{dustT}
 
   #Dust