From e328e1250b5bc28437fa0abeac58b97a55355d34 Mon Sep 17 00:00:00 2001 From: Mayeul Aubin Date: Mon, 2 Jun 2025 18:11:19 +0200 Subject: [PATCH 1/2] COCA parameters --- sbmy_control/parameters_card.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sbmy_control/parameters_card.py b/sbmy_control/parameters_card.py index dc6d383..bbdc1a6 100644 --- a/sbmy_control/parameters_card.py +++ b/sbmy_control/parameters_card.py @@ -47,6 +47,10 @@ def register_arguments_card(parser:ArgumentParser): parser.add_argument("--OutputFCsDensity", type=str, default=None, help="Output FCs density file.") parser.add_argument("--OutputFCsSnapshot", type=str, default=None, help="Output FCs snapshot file.") parser.add_argument("--OutputRngStateLPT", type=str, default=None, help="Output RNG state file.") + parser.add_argument("--WriteReferenceFrame", type=bool, default=False, help="Write reference frame (COCA).") + parser.add_argument("--OutputMomentaBase", type=str, default=None, help="Output momenta base (COCA).") + parser.add_argument("--ReadReferenceFrame", type=bool, default=False, help="Read reference frame (COCA).") + parser.add_argument("--InputMomentaBase", type=str, default=None, help="Read momenta base (COCA).") def register_arguments_card_for_ICs(parser:ArgumentParser): @@ -112,6 +116,10 @@ def parse_arguments_card(parsed_args): GenerateLightcone=parsed_args.GenerateLightcone, OutputAlsoFCs=parsed_args.OutputAlsoFCs, Observer=parsed_args.Observer, + WriteReferenceFrame=parsed_args.WriteReferenceFrame, + OutputMomentaBase=parsed_args.OutputMomentaBase, + ReadReferenceFrame=parsed_args.ReadReferenceFrame, + InputMomentaBase=parsed_args.InputMomentaBase, N_tiles=parsed_args.N_tiles, Np_buffer=parsed_args.Np_buffer, Np_lpt_buffer=parsed_args.Np_lpt_buffer, @@ -203,6 +211,10 @@ def parse_arguments_card(parsed_args): card_dict["OutputFCsSnapshot"] = main_dict["resultdir"]+"final_particles_"+main_dict["simname"]+".gadget3" if card_dict["OutputRngStateLPT"] is None: card_dict["OutputRngStateLPT"] = main_dict["workdir"]+"rng_state.h5" + if card_dict["OutputMomentaBase"] is None: + card_dict["OutputMomentaBase"] = main_dict["workdir"]+"momenta_"+main_dict["simname"]+"_" + if card_dict["InputMomentaBase"] is None: + card_dict["InputMomentaBase"] = main_dict["workdir"]+"momenta_"+main_dict["simname"]+"_" return card_dict @@ -321,6 +333,12 @@ def create_parameter_card_dict( OutputFCsDensity:str = 'fcs_density.h5', OutputFCsSnapshot:str = 'fcs_particles.gadget3', + ## COCA parameters + WriteReferenceFrame:bool = False, + OutputMomentaBase:str = 'momenta_', + ReadReferenceFrame:bool = False, + InputMomentaBase:str = 'momenta_', + ## Cosmological parameters h:float = 0.6732, Omega_m:float = 0.302, @@ -375,6 +393,10 @@ def create_parameter_card_dict( Observer2=Observer[2], OutputFCsDensity=OutputFCsDensity, OutputFCsSnapshot=OutputFCsSnapshot, + WriteReferenceFrame=int(WriteReferenceFrame), + OutputMomentaBase=OutputMomentaBase, + ReadReferenceFrame=int(ReadReferenceFrame), + InputMomentaBase=InputMomentaBase, NumberOfTilesPerDimension=N_tiles, NumberOfParticlesInBuffer=Np_buffer, NumberOfParticlesInLPTBuffer=Np_lpt_buffer, From ca12e6ab9c694b56c452aeb0faeb0b3c2d69e435 Mon Sep 17 00:00:00 2001 From: Mayeul Aubin Date: Mon, 2 Jun 2025 18:12:36 +0200 Subject: [PATCH 2/2] default directory is ./ --- sbmy_control/analysis/power_spectrum.py | 2 +- sbmy_control/analysis/slices.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbmy_control/analysis/power_spectrum.py b/sbmy_control/analysis/power_spectrum.py index f47466e..7a92370 100644 --- a/sbmy_control/analysis/power_spectrum.py +++ b/sbmy_control/analysis/power_spectrum.py @@ -271,7 +271,7 @@ def console_main(): parser.add_argument('-ps', '--power_spectrum', action='store_true', help='Plot power spectra.') parser.add_argument('-cc', '--cross_correlation', action='store_true', help='Plot cross correlations.') - parser.add_argument('-d', '--directory', type=str, required=True, help='Directory containing the fields files.') + parser.add_argument('-d', '--directory', type=str, default='./', help='Directory containing the fields files.') parser.add_argument('-ref', '--reference', type=str, default=None, help='Reference field file.') parser.add_argument('-f', '--filenames', type=str, nargs='+', required=True, help='Field files to be plotted.') parser.add_argument('-o', '--output', type=str, default=None, help='Output plot file name.') diff --git a/sbmy_control/analysis/slices.py b/sbmy_control/analysis/slices.py index 9c8f5a5..98cbfe9 100755 --- a/sbmy_control/analysis/slices.py +++ b/sbmy_control/analysis/slices.py @@ -154,7 +154,7 @@ def console_main(): parser.add_argument('-a','--axis', type=int, default=0, help='Axis along which the slices will be taken.') parser.add_argument('-i','--index', type=int, default=None, help='Index of the slice along the axis.') - parser.add_argument('-d', '--directory', type=str, required=True, help='Directory containing the fields files.') + parser.add_argument('-d', '--directory', type=str, default='./', help='Directory containing the fields files.') parser.add_argument('-ref', '--reference', type=str, default=None, help='Reference field file.') parser.add_argument('-f', '--filenames', type=str, nargs='+', required=True, help='Field files to be plotted.') parser.add_argument('-o', '--output', type=str, default=None, help='Output plot file name.')