From 2e6792d02f1f6cb918ff439a4ae4574032f7ff86 Mon Sep 17 00:00:00 2001 From: mathias77515 Date: Wed, 11 Sep 2024 10:24:59 +0200 Subject: [PATCH] add preset initialization --- src/CMM/params.yml | 6 +++--- src/FMM/__init__.py | 2 ++ src/__init__.py | 3 ++- src/run.py | 12 ++++++------ src/running_scripts/__init__.py | 1 + src/{running_scrips => running_scripts}/run_cmm.py | 0 src/{running_scrips => running_scripts}/run_cmm.sh | 0 .../run_fit_fmm.py | 0 src/{running_scrips => running_scripts}/run_fmm.py | 11 ++++++++--- src/{running_scrips => running_scripts}/run_fmm.sh | 0 .../run_spectra_cmm.py | 0 11 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 src/running_scripts/__init__.py rename src/{running_scrips => running_scripts}/run_cmm.py (100%) rename src/{running_scrips => running_scripts}/run_cmm.sh (100%) rename src/{running_scrips => running_scripts}/run_fit_fmm.py (100%) rename src/{running_scrips => running_scripts}/run_fmm.py (81%) rename src/{running_scrips => running_scripts}/run_fmm.sh (100%) rename src/{running_scrips => running_scripts}/run_spectra_cmm.py (100%) diff --git a/src/CMM/params.yml b/src/CMM/params.yml index d00e001..a35266a 100644 --- a/src/CMM/params.yml +++ b/src/CMM/params.yml @@ -49,7 +49,7 @@ QUBIC: ### This section control the parameters related to QUBIC instrument: 'DB' # Instrumental design (DB or UWB) - npointings: 500 # Number of time samples + npointings: 1000 # Number of time samples nsub_in: 8 # Number of sub-acquisitions nsub_out: 8 # Number of sub-acquisitions for the reconstruction convolution_in: False # Angular resolution in the input TOD @@ -85,7 +85,7 @@ PLANCK: level_noise_planck: 1 # Noise level for Planck data nintegr_planck: 1 # Number of integration step for Planck data thr_planck: 0.2 # Threashold to remove planck weight within QUBIC patch - weight_planck: 0 # Weight of Planck data within the QUBIC patch + weight_planck: 1 # Weight of Planck data within the QUBIC patch fwhm_weight_planck: 0 # FWHM for apodized QUBIC patch 30GHz: False 44GHz: False @@ -102,7 +102,7 @@ PCG: n_init_iter_pcg: 10 n_iter_pcg: 10 # Number of PCG iterations tol_pcg: 1.0e-20 # Tolerance for PCG - n_iter_loop: 100 # Number of loop (1 loop is PCG + beta fitting + gain reconstruction) + n_iter_loop: 1000 # Number of loop (1 loop is PCG + beta fitting + gain reconstruction) ites_to_converge: 1 # should be less than k tol_rms: 1.0e-10 #fix_pixels_outside_patch: True # Fixing pixels outside QUBIC patch diff --git a/src/FMM/__init__.py b/src/FMM/__init__.py index e69de29..f5f8bbc 100644 --- a/src/FMM/__init__.py +++ b/src/FMM/__init__.py @@ -0,0 +1,2 @@ +from .pipeline import * +print('importing pipeline fmm') \ No newline at end of file diff --git a/src/__init__.py b/src/__init__.py index da79187..e41815b 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,3 +1,4 @@ from .FMM import * from .CMM import * -from .lib import * \ No newline at end of file +from .lib import * +from .running_scripts import * \ No newline at end of file diff --git a/src/run.py b/src/run.py index a3b3ede..edcf2d4 100644 --- a/src/run.py +++ b/src/run.py @@ -1,9 +1,9 @@ -import sys -from pyoperators import * -from FMM.pipeline import PipelineEnd2End -from CMM.pipeline import Pipeline - - +#import sys +#from pyoperators import * +#from FMM.pipeline import PipelineEnd2End +#from CMM.pipeline import Pipeline +import running_scripts +stop simu = 'CMM' if __name__ == "__main__": diff --git a/src/running_scripts/__init__.py b/src/running_scripts/__init__.py new file mode 100644 index 0000000..2f50844 --- /dev/null +++ b/src/running_scripts/__init__.py @@ -0,0 +1 @@ +print(1111) \ No newline at end of file diff --git a/src/running_scrips/run_cmm.py b/src/running_scripts/run_cmm.py similarity index 100% rename from src/running_scrips/run_cmm.py rename to src/running_scripts/run_cmm.py diff --git a/src/running_scrips/run_cmm.sh b/src/running_scripts/run_cmm.sh similarity index 100% rename from src/running_scrips/run_cmm.sh rename to src/running_scripts/run_cmm.sh diff --git a/src/running_scrips/run_fit_fmm.py b/src/running_scripts/run_fit_fmm.py similarity index 100% rename from src/running_scrips/run_fit_fmm.py rename to src/running_scripts/run_fit_fmm.py diff --git a/src/running_scrips/run_fmm.py b/src/running_scripts/run_fmm.py similarity index 81% rename from src/running_scrips/run_fmm.py rename to src/running_scripts/run_fmm.py index 1d53aed..ae3c1a3 100644 --- a/src/running_scrips/run_fmm.py +++ b/src/running_scripts/run_fmm.py @@ -1,7 +1,12 @@ -import sys -from pyoperators import * - +#import sys +#from pyoperators import * +#import FMM +import running_scripts +stop from ..FMM.pipeline import PipelineEnd2End + +stop + #from .FMM.pipeline import PipelineEnd2End diff --git a/src/running_scrips/run_fmm.sh b/src/running_scripts/run_fmm.sh similarity index 100% rename from src/running_scrips/run_fmm.sh rename to src/running_scripts/run_fmm.sh diff --git a/src/running_scrips/run_spectra_cmm.py b/src/running_scripts/run_spectra_cmm.py similarity index 100% rename from src/running_scrips/run_spectra_cmm.py rename to src/running_scripts/run_spectra_cmm.py