Cosmoglobe · unfunfunt · Jun 9, 2022 · Jun 16, 2022 · Jun 30, 2022 · Aug 5, 2022
diff --git a/.gitignore b/.gitignore
@@ -78,3 +78,4 @@ commander3/todscripts/quiet/quiet_qband_beam_instrumental_v1.fits
 #---------------------------------------------------------------
 commander3/parameter_files/defaults/bands/DIRBE/old
 commander3/parameter_files/defaults/bands/DIRBE/old2
+
diff --git a/Makefile b/Makefile
@@ -111,6 +111,8 @@ all : commander
 commander :
 	@cd commander3/src; $(MAKE)
 
+sharp_test:
+	@cd commander3/src; $(MAKE) sharp_test
+
 clean :
 	@cd commander3/src; $(MAKE) clean
-
diff --git a/cmake/compilers/intel.cmake b/cmake/compilers/intel.cmake
@@ -70,37 +70,28 @@ if (COMMANDER3_Fortran_COMPILER_FLAGS_RELEASE MATCHES "")
 		"-xHost" 
 		"-fpe0"
 		"-fPIC"
-		#"-fp-model=strict"
 		"-traceback" 
 		"-qopenmp" #<= we are not using it at all, it is redundant 
 		"-assume" "byterecl" # for I/O operations 
-		#"-qopt-matmul" #<= increases linking time but doesn't increase performance 
-		#"-DNDEBUG"
-		#"-ipo" #  
-		#"-parallel" 
 		"-heap-arrays" "16384"
 		)
 endif()
 if(COMMANDER3_Fortran_COMPILER_FLAGS_DEBUG MATCHES "")
 	list(APPEND COMMANDER3_Fortran_COMPILER_FLAGS_DEBUG 
 		"-O0"  
-		"-g" 
+    "-g" 
 		"-xHost" 
-		"-debug" "all"
-		"-check" "all,noarg_temp_created"
-		"-warn" "all,nounused,noexternal"
-		"-fp-stack-check"
-		"-fstack-protector-all"
+    "-debug" "all"
+    "-check" "all,nouninit"
+    "-warn" "all,nounused,noexternal"
+    "-fp-stack-check"
+    "-fstack-protector-all"
 		"-traceback" 
-		"-parallel" 
 		"-qopenmp"
-		"-C" 
 		"-assume" "byterecl" 
 		"-heap-arrays" "16384"
 		"-fpe0"
 		"-fPIC"
-    #"-ftrapuv"
-    #"-init=snan,arrays"
 		)
 endif()
 if(COMMANDER3_Fortran_COMPILER_FLAGS_RELWITHDEBINFO MATCHES "")
@@ -110,34 +101,18 @@ if(COMMANDER3_Fortran_COMPILER_FLAGS_RELWITHDEBINFO MATCHES "")
 		"-g" 
 		"-fpe0"
 		"-fPIC"
-		#"-fp-model=strict"
 		"-qopenmp" 
 		"-assume" "byterecl" # for I/O operations 
-		#"-qopt-matmul" #<= increases linking time but doesn't increase performance 
 		"-traceback" 
 		"-heap-arrays" "16384"
-		#
-		#"-O2"  
-		#"-g" 
-		#"-traceback" 
-		#"-DNDEBUG" 
-		#"-parallel" 
-		#"-qopenmp"
-		#"-qopt-matmul"
-		#"-C"
-		#"-assume" "byterecl" 
-		#"-fpe0"
-		#"-fPIC"
 		)
 endif()
 if(COMMANDER3_Fortran_COMPILER_FLAGS_MINSIZEREL MATCHES "")
 	list(APPEND COMMANDER3_Fortran_COMPILER_FLAGS_MINSIZEREL 
 		"-Os"
 		"-traceback" 
 		"-DNDEBUG" 
-		"-parallel" 
 		"-qopenmp" 
-		"-C"
 		"-assume" "byterecl" 
 		"-heap-arrays" "16384"
 		"-fpe0"

diff --git a/cmake/projects/commander3.cmake b/cmake/projects/commander3.cmake
@@ -59,11 +59,13 @@ set(sources
 	# TOD processing modules
 	${COMMANDER3_SOURCE_DIR}/comm_tod_noise_psd_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_tod_mod.f90
+	${COMMANDER3_SOURCE_DIR}/comm_tod_pixhist_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_tod_driver_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_tod_mapmaking_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_tod_lfi_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_tod_lfi_smod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_tod_hfi_mod.f90
+	${COMMANDER3_SOURCE_DIR}/comm_tod_hfi_smod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_tod_gain_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_tod_gain_smod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_tod_noise_mod.f90
@@ -99,6 +101,7 @@ set(sources
 	${COMMANDER3_SOURCE_DIR}/comm_utils.f90
 	${COMMANDER3_SOURCE_DIR}/comm_bp_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_f_mod.f90
+	${COMMANDER3_SOURCE_DIR}/comm_dust_extinction_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_ptsrc_comp_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_zodi_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_zodi_samp_mod.f90
@@ -130,8 +133,10 @@ set(sources
 	${COMMANDER3_SOURCE_DIR}/comm_status_mod.f90
 	${COMMANDER3_SOURCE_DIR}/locate_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_conviqt_mod.f90
+        ${COMMANDER3_SOURCE_DIR}/comm_tod_cray_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_map_mod.f90
 	${COMMANDER3_SOURCE_DIR}/math_tools.f90
+	${COMMANDER3_SOURCE_DIR}/comm_sparse_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_cr_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_mbb_comp_mod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_mbbtab_comp_mod.f90
@@ -166,6 +171,7 @@ set(sources
   ${COMMANDER3_SOURCE_DIR}/comm_tod_adc_mod.f90
   ${COMMANDER3_SOURCE_DIR}/comm_tod_adc_smod.f90
 	${COMMANDER3_SOURCE_DIR}/comm_ame_lognormal_mod.f90
+        ${COMMANDER3_SOURCE_DIR}/comm_tod_crosstalk_mod.f90
 	# CAMB
 	#${COMMANDER3_SOURCE_DIR}/comm_camb_mod.f90
 	)

diff --git a/cmake/projects/healpix.cmake b/cmake/projects/healpix.cmake
@@ -44,28 +44,23 @@ if(COMPILE_HEALPIX)
 	# Below flags used to configure Libsharp as part of HEALPix
 	if(CMAKE_Fortran_COMPILER_ID MATCHES Intel)
 		#set(healpix_sharp2_C_FLAGS "-static-intel -O3 -ffast-math -march=native -std=c99 -DUSE_MPI -qopenmp -D__PURE_INTEL_C99_HEADERS__")
-		#set(healpix_sharp2_C_FLAGS "-static-intel -O3 -ffast-math -std=c99 -DUSE_MPI -qopenmp -D__PURE_INTEL_C99_HEADERS__")
-		set(healpix_sharp2_C_FLAGS "-static-intel -O3 -ffast-math -mavx2 -std=c99 -DUSE_MPI -qopenmp -D__PURE_INTEL_C99_HEADERS__")
-		# MPI support, OpenMP, portable binary:
-		#set(healpix_sharp2_C_FLAGS "-DUSE_MPI -DMULTIARCH -std=c99 -O3 -ffast-math")
+                if(CMAKE_BUILD_TYPE MATCHES Release)
+		    set(healpix_sharp2_C_FLAGS "-static-intel -O3 -fno-strict-aliasing -march=native -std=c99 -DUSE_MPI -qopenmp -D__PURE_INTEL_C99_HEADERS__")
+                elseif(CMAKE_BUILD_TYPE MATCHES Debug)
+                    set(healpix_sharp2_C_FLAGS "-static-intel -O0 -g -fno-strict-aliasing -march=native -std=c99 -DUSE_MPI -qopenmp -D__PURE_INTEL_C99_HEADERS__")
+                endif()
 	elseif(CMAKE_Fortran_COMPILER_ID MATCHES GNU)
-		#set(healpix_sharp2_C_FLAGS "-O3 -ffast-math -march=native -std=c99 -DUSE_MPI -fopenmp")
-		#set(healpix_sharp2_C_FLAGS "-DUSE_MPI -DMULTIARCH -std=c99 -O3 -ffast-math")
 		set(healpix_sharp2_C_FLAGS "-O3 -ffast-math -mavx2 -std=c99 -DUSE_MPI -fopenmp")
 	elseif(CMAKE_Fortran_COMPILER_ID MATCHES PGI)
 		set(healpix_sharp2_C_FLAGS "-O4 -fast -Mipa=fast,inline -Msmartalloc -std=c99 -DUSE_MPI -mp")
-	#elseif(CMAKE_Fortran_COMPILER_ID MATCHES NVIDIA)
-		#set(healpix_sharp2_C_FLAGS "-O4 -fast -Mipa=fast,inline -Msmartalloc -std=c99 -DUSE_MPI -mp")
 	elseif(CMAKE_Fortran_COMPILER_ID MATCHES Flang)
-		#set(healpix_sharp2_C_FLAGS "-O4 -fast -Mipa=fast,inline -Msmartalloc -std=c99 -DUSE_MPI -mp")
 		set(healpix_sharp2_C_FLAGS "-DUSE_MPI -DMULTIARCH -std=c99 -O3 -ffast-math")
 	endif()
 	#------------------------------------------------------------------------------
-	# Copying modyfied configure script to healpix root
+	# Copying modified configure script to healpix root
 	list(APPEND healpix_copy_configure_script 
 		"${CMAKE_COMMAND}" "-E" "copy"
 		"${CMAKE_SOURCE_DIR}/cmake/third_party/healpix/hpxconfig_functions.sh"
-		#"${CMAKE_DOWNLOAD_DIRECTORY}/${project}/src/${project}/hpxconfig_functions.sh" 
 		"${HEALPIX_SOURCE_DIR}/hpxconfig_functions.sh" 
 		#"&&"
 		)

diff --git a/cmake/sources.cmake b/cmake/sources.cmake
@@ -80,7 +80,7 @@ set(blas_md5 "5cd5df5a1541ad414f5874aaae17730f")
 # FFTW
 #------------------------------------------------------------------------------
 #set(fftw_url "http://fftw.org/fftw-3.3.8.tar.gz")
-set(fftw_url "http://fftw.org/fftw-3.3.9.tar.gz")
+set(fftw_url "https://fftw.org/fftw-3.3.9.tar.gz")
 #set(fftw_md5 "8aac833c943d8e90d51b697b27d4384d")
 set(fftw_md5 "50145bb68a8510b5d77605f11cadf8dc")
 #------------------------------------------------------------------------------
@@ -104,7 +104,10 @@ set(hdf5_md5 "9e22217d22eb568e09f0cc15fb641d7c")
 #------------------------------------------------------------------------------
 #set(cfitsio_url "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.47.tar.gz")
 #set(cfitsio_url "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz")
-set(cfitsio_url "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.0.0.tar.gz")
+set(cfitsio_url "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.0.0.tar.gz")
+#set(cfitsio_url "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.6.2.tar.gz")
+# See https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html for latest
+# versions
 #------------------------------------------------------------------------------
 # HEALPix
 #------------------------------------------------------------------------------

diff --git a/commander3/config/config.ita_oneapi b/commander3/config/config.ita_oneapi
@@ -57,7 +57,6 @@ export MPCC := mpiicc
 export F90FLAGS := -fpe0 -mavx2 -fpp -g -O0 -traceback -assume byterecl -qopenmp -parallel -C
 
 #debug
-#
 #export F90FLAGS := -O0 -g -C -traceback -assume byterecl -heap-arrays 16384 -qopenmp -parallel -fpe0 -check noarg_temp_created -ftrapuv
 
 

diff --git a/commander3/parameter_files/defaults/HFI_tod.defaults b/commander3/parameter_files/defaults/HFI_tod.defaults
@@ -9,8 +9,12 @@ SAMPLE_SIGNAL_AMPLITUDES      = .true.
 SAMPLE_SPECTRAL_INDICES       = .true.
 SAMPLE_POWSPEC                = .false.
 
+SAMPLE_SOLAR_MAPS             = .false.
+SAMPLE_MOON_MAPS              = .false
+SAMPLE_EARTH_MAPS             = .false.  # Only as a function of elongation
+
 ENABLE_TOD_ANALYSIS           = .true.
-TOD_OUTPUT_4D_MAP_EVERY_NTH_ITER = 10
+TOD_OUTPUT_4D_MAP_EVERY_NTH_ITER = -1
 TOD_OUTPUT_AUXILIARY_MAPS_EVERY_NTH_ITER = 10
 TOD_INCLUDE_ZODI              = .false.
 FFTW3_MAGIC_NUMBERS           = fft3_magic_numbers_230810.txt

diff --git a/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_01_CIO_256.defaults b/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_01_CIO_256.defaults
@@ -65,3 +65,15 @@ BAND_TOD_ZODI_SUBTRACTION&&&   = .true.
 BAND_TOD_ZODI_MASK&&&          = zodi_proc_mask_01.fits
 BAND_TOD_ZODI_EMISSIVITY&&&    = 1.d0,1.d0,1.d0,1.d0,1.d0,1.d0
 BAND_TOD_ZODI_ALBEDO&&&        = 0.20411939612669797d0,0.20411939612669797d0,0.20411939612669797d0,0.20411939612669797d0,0.20411939612669797d0,0.20411939612669797d0
+
+BAND_TOD_SOLAR_CENTRIC_MODEL&&&   = none
+BAND_TOD_SOLAR_CENTRIC_MASK&&&    = none
+BAND_TOD_SOLAR_CENTRIC_INITMAP&&& = none
+BAND_TOD_MOON_CENTRIC_MODEL&&&    = none
+BAND_TOD_MOON_CENTRIC_MASK&&&     = none
+BAND_TOD_MOON_CENTRIC_INITMAP&&&  = none
+BAND_TOD_EARTH_CENTRIC_MODEL&&&   = none
+BAND_TOD_EARTH_CENTRIC_MASK&&&    = none
+BAND_TOD_EARTH_CENTRIC_INITMAP&&& = none
+
+BAND_TOD_MAPMAKE_TYPE&&& = binned
diff --git a/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_01_CIO_512.defaults b/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_01_CIO_512.defaults
@@ -41,7 +41,7 @@ BAND_TOD_HALFRING&&&           = 0
 BAND_TOD_START_SCANID&&&       = 1
 BAND_TOD_END_SCANID&&&         = 285
 BAND_TOD_TOT_NUMSCAN&&&        = 285
-BAND_TOD_FLAG&&&               = 2047   # Don't mask Uranus and Neptune, 8191
+BAND_TOD_FLAG&&&               = 10239 # All planets except Neptune/Uranus. Also comets 
 BAND_TOD_ORBITAL_ONLY_ABSCAL&&& =.false.
 BAND_TOD_DETECTOR_LIST&&&      = 01_A
 BAND_TOD_INIT_FROM_HDF&&&      = default
@@ -66,4 +66,16 @@ BAND_TOD_ZODI_SUBTRACTION&&&   = .true.
 BAND_TOD_ZODI_MASK&&&          = zodi_proc_mask_01_n512.fits
 BAND_TOD_ZODI_EMISSIVITY&&&    = 1.d0,1.d0,1.d0,1.d0,1.d0,1.d0
 BAND_TOD_ZODI_ALBEDO&&&        = 0.20411939612669797d0,0.20411939612669797d0,0.20411939612669797d0,0.20411939612669797d0,0.20411939612669797d0,0.20411939612669797d0
-BAND_TOD_ZODI_REFERENCE_BAND&&&= .false.
+BAND_TOD_ZODI_REFERENCE_BAND&&&= .false.
+
+BAND_TOD_SOLAR_CENTRIC_MODEL&&&   = none
+BAND_TOD_SOLAR_CENTRIC_MASK&&&    = none
+BAND_TOD_SOLAR_CENTRIC_INITMAP&&& = none
+BAND_TOD_MOON_CENTRIC_MODEL&&&    = none
+BAND_TOD_MOON_CENTRIC_MASK&&&     = none
+BAND_TOD_MOON_CENTRIC_INITMAP&&&  = none
+BAND_TOD_EARTH_CENTRIC_MODEL&&&   = none
+BAND_TOD_EARTH_CENTRIC_MASK&&&    = none
+BAND_TOD_EARTH_CENTRIC_INITMAP&&& = none
+
+BAND_TOD_MAPMAKE_TYPE&&& = binned
diff --git a/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_01_CIO_512.defaults~ b/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_01_CIO_512.defaults~
@@ -66,3 +66,13 @@ BAND_TOD_SUBTRACT_ZODI&&&   = .true. # if true, the following parameters must be
 BAND_TOD_ZODI_MASK&&&       = zodi_proc_mask_01.fits
 BAND_ZODI_EMISSIVITY&&&     = 1.d0,1.d0,1.d0,1.d0,1.d0,1.d0
 BAND_ZODI_ALBEDO&&&         = 0.20411939612669797d0,0.20411939612669797d0,0.20411939612669797d0,0.20411939612669797d0,0.20411939612669797d0,0.20411939612669797d0
+
+BAND_TOD_SOLAR_CENTRIC_MODEL&&&   = none
+BAND_TOD_SOLAR_CENTRIC_MASK&&&    = none
+BAND_TOD_SOLAR_CENTRIC_INITMAP&&& = none
+BAND_TOD_MOON_CENTRIC_MODEL&&&    = none
+BAND_TOD_MOON_CENTRIC_MASK&&&     = none
+BAND_TOD_MOON_CENTRIC_INITMAP&&&  = none
+BAND_TOD_EARTH_CENTRIC_MODEL&&&   = none
+BAND_TOD_EARTH_CENTRIC_MASK&&&    = none
+BAND_TOD_EARTH_CENTRIC_INITMAP&&& = none
diff --git a/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_02_CIO_256.defaults b/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_02_CIO_256.defaults
@@ -65,3 +65,15 @@ BAND_TOD_ZODI_SUBTRACTION&&&   = .true.
 BAND_TOD_ZODI_MASK&&&          = zodi_proc_mask_02.fits
 BAND_TOD_ZODI_EMISSIVITY&&&    = 1.d0,1.d0,1.d0,1.d0,1.d0,1.d0
 BAND_TOD_ZODI_ALBEDO&&&        = 0.25521132892052301d0,0.25521132892052301d0,0.25521132892052301d0,0.25521132892052301d0,0.25521132892052301d0,0.25521132892052301d0
+
+BAND_TOD_SOLAR_CENTRIC_MODEL&&&   = none
+BAND_TOD_SOLAR_CENTRIC_MASK&&&    = none
+BAND_TOD_SOLAR_CENTRIC_INITMAP&&& = none
+BAND_TOD_MOON_CENTRIC_MODEL&&&    = none
+BAND_TOD_MOON_CENTRIC_MASK&&&     = none
+BAND_TOD_MOON_CENTRIC_INITMAP&&&  = none
+BAND_TOD_EARTH_CENTRIC_MODEL&&&   = none
+BAND_TOD_EARTH_CENTRIC_MASK&&&    = none
+BAND_TOD_EARTH_CENTRIC_INITMAP&&& = none
+
+BAND_TOD_MAPMAKE_TYPE&&& = binned
diff --git a/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_02_CIO_256.defaults~ b/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_02_CIO_256.defaults~
@@ -66,3 +66,13 @@ BAND_TOD_SUBTRACT_ZODI&&&   = .true. # if true, the following parameters must be
 BAND_TOD_ZODI_MASK&&&       = zodi_proc_mask_02_n512.fits
 BAND_ZODI_EMISSIVITY&&&     = 1.d0,1.d0,1.d0,1.d0,1.d0,1.d0
 BAND_ZODI_ALBEDO&&&         = 0.25521132892052301d0,0.25521132892052301d0,0.25521132892052301d0,0.25521132892052301d0,0.25521132892052301d0,0.25521132892052301d0
+
+BAND_TOD_SOLAR_CENTRIC_MODEL&&&   = none
+BAND_TOD_SOLAR_CENTRIC_MASK&&&    = none
+BAND_TOD_SOLAR_CENTRIC_INITMAP&&& = none
+BAND_TOD_MOON_CENTRIC_MODEL&&&    = none
+BAND_TOD_MOON_CENTRIC_MASK&&&     = none
+BAND_TOD_MOON_CENTRIC_INITMAP&&&  = none
+BAND_TOD_EARTH_CENTRIC_MODEL&&&   = none
+BAND_TOD_EARTH_CENTRIC_MASK&&&    = none
+BAND_TOD_EARTH_CENTRIC_INITMAP&&& = none
diff --git a/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_02_CIO_512.defaults b/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_02_CIO_512.defaults
@@ -41,7 +41,7 @@ BAND_TOD_HALFRING&&&           = 0
 BAND_TOD_START_SCANID&&&       = 1
 BAND_TOD_END_SCANID&&&         = 285
 BAND_TOD_TOT_NUMSCAN&&&        = 285
-BAND_TOD_FLAG&&&               = 2047   # Don't mask Uranus and Neptune, 8191
+BAND_TOD_FLAG&&&               = 10239 # All planets except Neptune/Uranus. Also comets 
 BAND_TOD_ORBITAL_ONLY_ABSCAL&&& =.false.
 BAND_TOD_DETECTOR_LIST&&&      = 02_A
 BAND_TOD_INIT_FROM_HDF&&&      = default
@@ -66,4 +66,16 @@ BAND_TOD_ZODI_SUBTRACTION&&&   = .true.
 BAND_TOD_ZODI_MASK&&&          = zodi_proc_mask_02_n512.fits
 BAND_TOD_ZODI_EMISSIVITY&&&    = 1.d0,1.d0,1.d0,1.d0,1.d0,1.d0
 BAND_TOD_ZODI_ALBEDO&&&        = 0.25521132892052301d0,0.25521132892052301d0,0.25521132892052301d0,0.25521132892052301d0,0.25521132892052301d0,0.25521132892052301d0
-BAND_TOD_ZODI_REFERENCE_BAND&&&= .false.
+BAND_TOD_ZODI_REFERENCE_BAND&&&= .false.
+
+BAND_TOD_SOLAR_CENTRIC_MODEL&&&   = none
+BAND_TOD_SOLAR_CENTRIC_MASK&&&    = none
+BAND_TOD_SOLAR_CENTRIC_INITMAP&&& = none
+BAND_TOD_MOON_CENTRIC_MODEL&&&    = none
+BAND_TOD_MOON_CENTRIC_MASK&&&     = none
+BAND_TOD_MOON_CENTRIC_INITMAP&&&  = none
+BAND_TOD_EARTH_CENTRIC_MODEL&&&   = none
+BAND_TOD_EARTH_CENTRIC_MASK&&&    = none
+BAND_TOD_EARTH_CENTRIC_INITMAP&&& = none
+
+BAND_TOD_MAPMAKE_TYPE&&& = binned
diff --git a/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_03_CIO_256.defaults b/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_03_CIO_256.defaults
@@ -66,3 +66,15 @@ BAND_TOD_ZODI_SUBTRACTION&&&   = .true.
 BAND_TOD_ZODI_MASK&&&          = zodi_proc_mask_03.fits
 BAND_TOD_ZODI_EMISSIVITY&&&    = 1.6598924040649741d0,1.6598924040649741d0,1.6598924040649741d0,1.6598924040649741d0,1.6598924040649741d0,1.6598924040649741d0
 BAND_TOD_ZODI_ALBEDO&&&        = 0.21043660481632315d0,0.21043660481632315d0,0.21043660481632315d0,0.21043660481632315d0,0.21043660481632315d0,0.21043660481632315d0
+
+BAND_TOD_SOLAR_CENTRIC_MODEL&&&   = none
+BAND_TOD_SOLAR_CENTRIC_MASK&&&    = none
+BAND_TOD_SOLAR_CENTRIC_INITMAP&&& = none
+BAND_TOD_MOON_CENTRIC_MODEL&&&    = none
+BAND_TOD_MOON_CENTRIC_MASK&&&     = none
+BAND_TOD_MOON_CENTRIC_INITMAP&&&  = none
+BAND_TOD_EARTH_CENTRIC_MODEL&&&   = none
+BAND_TOD_EARTH_CENTRIC_MASK&&&    = none
+BAND_TOD_EARTH_CENTRIC_INITMAP&&& = none
+
+BAND_TOD_MAPMAKE_TYPE&&& = binned
diff --git a/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_03_CIO_512.defaults b/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_03_CIO_512.defaults
@@ -42,7 +42,7 @@ BAND_TOD_HALFRING&&&           = 0
 BAND_TOD_START_SCANID&&&       = 1
 BAND_TOD_END_SCANID&&&         = 285
 BAND_TOD_TOT_NUMSCAN&&&        = 285
-BAND_TOD_FLAG&&&               = 2047   # Don't mask Uranus and Neptune, 8191
+BAND_TOD_FLAG&&&               = 10239 # All planets except Neptune/Uranus. Also comets 
 BAND_TOD_ORBITAL_ONLY_ABSCAL&&& =.false.
 BAND_TOD_DETECTOR_LIST&&&      = 03_A
 BAND_TOD_INIT_FROM_HDF&&&      = default
@@ -67,4 +67,16 @@ BAND_TOD_ZODI_SUBTRACTION&&&   = .true.
 BAND_TOD_ZODI_MASK&&&          = zodi_proc_mask_03_n512.fits
 BAND_TOD_ZODI_EMISSIVITY&&&    = 1.6598924040649741d0,1.6598924040649741d0,1.6598924040649741d0,1.6598924040649741d0,1.6598924040649741d0,1.6598924040649741d0
 BAND_TOD_ZODI_ALBEDO&&&        = 0.21043660481632315d0,0.21043660481632315d0,0.21043660481632315d0,0.21043660481632315d0,0.21043660481632315d0,0.21043660481632315d0
-BAND_TOD_ZODI_REFERENCE_BAND&&&= .false.
+BAND_TOD_ZODI_REFERENCE_BAND&&&= .false.
+
+BAND_TOD_SOLAR_CENTRIC_MODEL&&&   = none
+BAND_TOD_SOLAR_CENTRIC_MASK&&&    = none
+BAND_TOD_SOLAR_CENTRIC_INITMAP&&& = none
+BAND_TOD_MOON_CENTRIC_MODEL&&&    = none
+BAND_TOD_MOON_CENTRIC_MASK&&&     = none
+BAND_TOD_MOON_CENTRIC_INITMAP&&&  = none
+BAND_TOD_EARTH_CENTRIC_MODEL&&&   = none
+BAND_TOD_EARTH_CENTRIC_MASK&&&    = none
+BAND_TOD_EARTH_CENTRIC_INITMAP&&& = none
+
+BAND_TOD_MAPMAKE_TYPE&&& = binned
diff --git a/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_03_CIO_512.defaults~ b/commander3/parameter_files/defaults/bands/DIRBE/DIRBE_03_CIO_512.defaults~
@@ -68,3 +68,13 @@ BAND_TOD_SUBTRACT_ZODI&&&   = .true. # if true, the following parameters must be
 BAND_TOD_ZODI_MASK&&&       = zodi_proc_mask_03.fits
 BAND_ZODI_EMISSIVITY&&&     = 1.6598924040649741d0,1.6598924040649741d0,1.6598924040649741d0,1.6598924040649741d0,1.6598924040649741d0,1.6598924040649741d0
 BAND_ZODI_ALBEDO&&&         = 0.21043660481632315d0,0.21043660481632315d0,0.21043660481632315d0,0.21043660481632315d0,0.21043660481632315d0,0.21043660481632315d0
+
+BAND_TOD_SOLAR_CENTRIC_MODEL&&&   = none
+BAND_TOD_SOLAR_CENTRIC_MASK&&&    = none
+BAND_TOD_SOLAR_CENTRIC_INITMAP&&& = none
+BAND_TOD_MOON_CENTRIC_MODEL&&&    = none
+BAND_TOD_MOON_CENTRIC_MASK&&&     = none
+BAND_TOD_MOON_CENTRIC_INITMAP&&&  = none
+BAND_TOD_EARTH_CENTRIC_MODEL&&&   = none
+BAND_TOD_EARTH_CENTRIC_MASK&&&    = none
+BAND_TOD_EARTH_CENTRIC_INITMAP&&& = none
Original file line number	Diff line number	Diff line change
Expand Up		@@ -78,3 +78,4 @@ commander3/todscripts/quiet/quiet_qband_beam_instrumental_v1.fits
		#---------------------------------------------------------------
		commander3/parameter_files/defaults/bands/DIRBE/old
		commander3/parameter_files/defaults/bands/DIRBE/old2
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,7 +57,6 @@ export MPCC := mpiicc @@
     export F90FLAGS := -fpe0 -mavx2 -fpp -g -O0 -traceback -assume byterecl -qopenmp -parallel -C
     #debug
-    #
     #export F90FLAGS := -O0 -g -C -traceback -assume byterecl -heap-arrays 16384 -qopenmp -parallel -fpe0 -check noarg_temp_created -ftrapuv
@@ Expand Down @@