From 30c8a029c146e4e405855de0dd9f81dcb30c5bd5 Mon Sep 17 00:00:00 2001 From: Ievgen Vovk Date: Mon, 3 Jul 2023 10:31:20 +0900 Subject: [PATCH 1/4] Saldana-Lopez 2021 best/lower/upper EBL model classes. --- include/crpropa/PhotonBackground.h | 51 ++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/include/crpropa/PhotonBackground.h b/include/crpropa/PhotonBackground.h index 5dc5bf7ab..7f7d60f8f 100644 --- a/include/crpropa/PhotonBackground.h +++ b/include/crpropa/PhotonBackground.h @@ -71,7 +71,7 @@ class PhotonField: public Referenced { class TabularPhotonField: public PhotonField { public: TabularPhotonField(const std::string fieldName, const bool isRedshiftDependent = true); - + double getPhotonDensity(double ePhoton, double z = 0.) const; double getRedshiftScaling(double z) const; double getMinimumPhotonEnergy(double z) const; @@ -194,6 +194,45 @@ class IRB_Stecker16_lower: public TabularPhotonField { IRB_Stecker16_lower() : TabularPhotonField("IRB_Stecker16_lower", true) {} }; +/** + @class IRB_Saldana21 + @brief Extragalactic background light model from Saldana-Lopez et al. 2021 + + Source info: + DOI:10.1093/mnras/stab2393 + https://ui.adsabs.harvard.edu/abs/2021MNRAS.507.5144S/abstract + */ +class IRB_Saldana21: public TabularPhotonField { +public: + IRB_Saldana21() : TabularPhotonField("IRB_Saldana21", true) {} +}; + +/** + @class IRB_Saldana21_upper + @brief Extragalactic background light model from Saldana-Lopez et al. 2021 (upper-bound model) + + Source info: + DOI:10.1093/mnras/stab2393 + https://ui.adsabs.harvard.edu/abs/2021MNRAS.507.5144S/abstract + */ +class IRB_Saldana21_upper: public TabularPhotonField { +public: + IRB_Saldana21_upper() : TabularPhotonField("IRB_Saldana21_upper", true) {} +}; + +/** + @class IRB_Saldana21_lower + @brief Extragalactic background light model from Saldana-Lopez et al. 2021 (lower-bound model) + + Source info: + DOI:10.1093/mnras/stab2393 + https://ui.adsabs.harvard.edu/abs/2021MNRAS.507.5144S/abstract + */ +class IRB_Saldana21_lower: public TabularPhotonField { +public: + IRB_Saldana21_lower() : TabularPhotonField("IRB_Saldana21_lower", true) {} +}; + /** @class URB @brief Extragalactic background light model from Protheroe & Biermann 1996 @@ -210,11 +249,11 @@ class URB_Protheroe96: public TabularPhotonField { /** @class URB @brief Extragalactic background light model based on ARCADE2 observations, by Fixsen et al. - Note that this model does not cover the same energy range as other URB models. Here, only ~10 MHz - 10 GHz is considered. + Note that this model does not cover the same energy range as other URB models. Here, only ~10 MHz - 10 GHz is considered. Therefore, it only makes sense to use this model in very specific studies. - + Source info: - DOI:10.1088/0004-637X/734/1/5 + DOI:10.1088/0004-637X/734/1/5 https://iopscience.iop.org/article/10.1088/0004-637X/734/1/5 */ class URB_Fixsen11: public TabularPhotonField { @@ -224,8 +263,8 @@ class URB_Fixsen11: public TabularPhotonField { /** @class URB - @brief Extragalactic background light model by Nitu et al. - + @brief Extragalactic background light model by Nitu et al. + Source info: DOI:10.1016/j.astropartphys.2020.102532 https://www.sciencedirect.com/science/article/pii/S0927650520301043? From 4398af299eaa3a9e2f71f7759433fd1be0f5000d Mon Sep 17 00:00:00 2001 From: Ievgen Vovk Date: Mon, 24 Jul 2023 11:08:18 +0900 Subject: [PATCH 2/4] Changelog: adding Saldana21 EBL model --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d1feda9d..3197d6683 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ * New interface for massdistributions given on a Grid1f * Grids can be restricted to the volume without repetition (clipVolume parameter) * SourceFeature to sample the source position from a given massdistribution +* EBL model from Saldana-Lopez et al. 2021 ### Interface changes: * Weight column in hdf-Output is now called "W", which is the same as for TextOutput. From 7570e9d668bda9fd0ff9de24354cb598a2c9a3da Mon Sep 17 00:00:00 2001 From: mertelx Date: Fri, 20 Oct 2023 23:40:18 +0200 Subject: [PATCH 3/4] Update data download to work with Saldana 2021 EBL --- CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6088ba2fc..36dca0a6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -336,16 +336,18 @@ endif(APPLE) # Download data files (interaction data, masses, decay data ...) # ---------------------------------------------------------------------------- OPTION(DOWNLOAD_DATA "Download CRPropa data files" ON) -set(CRPROPA_DATAFILE_VER "2022-07-06") +set(CRPROPA_DATAFILE_VER "2023-10-20") if(DOWNLOAD_DATA) - message("-- Downloading data file from crpropa.desy.de ~ 65 MB") + message("-- Downloading data file from crpropa.desy.de ~ 73 MB") file(DOWNLOAD - https://www.desy.de/~crpropa/data/interaction_data/data-${CRPROPA_DATAFILE_VER}.tar.gz-CHECKSUM - ${CMAKE_BINARY_DIR}/data-${CRPROPA_DATAFILE_VER}.tar.gz-CHECKSUM) + https://ruhr-uni-bochum.sciebo.de/public.php/webdav/data-${CRPROPA_DATAFILE_VER}.tar.gz-CHECKSUM + ${CMAKE_BINARY_DIR}/data-${CRPROPA_DATAFILE_VER}.tar.gz-CHECKSUM + USERPWD "3juW9sntQX2IWBS") file(STRINGS ${CMAKE_BINARY_DIR}/data-${CRPROPA_DATAFILE_VER}.tar.gz-CHECKSUM DATA_CHECKSUM LIMIT_COUNT 1 LENGTH_MINIMUM 32 LENGTH_MAXIMUM 32) file(DOWNLOAD - https://www.desy.de/~crpropa/data/interaction_data/data-${CRPROPA_DATAFILE_VER}.tar.gz + https://ruhr-uni-bochum.sciebo.de/public.php/webdav/data-${CRPROPA_DATAFILE_VER}.tar.gz ${CMAKE_BINARY_DIR}/data-${CRPROPA_DATAFILE_VER}.tar.gz + USERPWD "3juW9sntQX2IWBS" EXPECTED_MD5 "${DATA_CHECKSUM}") message("-- Extracting data file") else() From aa5de5d3183b807d76fba5f04ecedeb2c9c3c1fd Mon Sep 17 00:00:00 2001 From: mertelx Date: Mon, 23 Oct 2023 17:39:59 +0200 Subject: [PATCH 4/4] Add correct download server label --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36dca0a6d..f30a207b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,7 +338,7 @@ endif(APPLE) OPTION(DOWNLOAD_DATA "Download CRPropa data files" ON) set(CRPROPA_DATAFILE_VER "2023-10-20") if(DOWNLOAD_DATA) - message("-- Downloading data file from crpropa.desy.de ~ 73 MB") + message("-- Downloading data files from sciebo ~ 73 MB") file(DOWNLOAD https://ruhr-uni-bochum.sciebo.de/public.php/webdav/data-${CRPROPA_DATAFILE_VER}.tar.gz-CHECKSUM ${CMAKE_BINARY_DIR}/data-${CRPROPA_DATAFILE_VER}.tar.gz-CHECKSUM