From 5898b628339cc3453980918a559434bd6f14cdf2 Mon Sep 17 00:00:00 2001 From: MialLewis <95620982+MialLewis@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:21:42 +0000 Subject: [PATCH] remove unneeded files --- EVSVesuvio/config/test_dir/analysis_inputs.py | 162 ------------------ .../placeholder.txt | 0 .../experiments/test_expr/placeholder.txt | 1 + .../config/test_dir/vesuvio.user.properties | 2 +- 4 files changed, 2 insertions(+), 163 deletions(-) delete mode 100644 EVSVesuvio/config/test_dir/analysis_inputs.py rename EVSVesuvio/config/test_dir/{experiment_cache => experiments}/placeholder.txt (100%) create mode 100644 EVSVesuvio/config/test_dir/experiments/test_expr/placeholder.txt diff --git a/EVSVesuvio/config/test_dir/analysis_inputs.py b/EVSVesuvio/config/test_dir/analysis_inputs.py deleted file mode 100644 index 8690a8ca..00000000 --- a/EVSVesuvio/config/test_dir/analysis_inputs.py +++ /dev/null @@ -1,162 +0,0 @@ -import numpy as np - - -class LoadVesuvioBackParameters: - def __init__(self, ipFilesPath): - self.ipfile = ipFilesPath / "ip2019.par" - - runs = "43066-43076" # 77K # The numbers of the runs to be analysed - empty_runs = ( - "41876-41923" # 77K # The numbers of the empty runs to be subtracted - ) - mode = "DoubleDifference" - - subEmptyFromRaw = True # Flag to control wether empty ws gets subtracted from raw - scaleEmpty = 1 # None or scaling factor - scaleRaw = 1 - - -class LoadVesuvioFrontParameters: - def __init__(self, ipFilesPath): - self.ipfile = ipFilesPath / "ip2018_3.par" - - runs = "43066-43076" # 100K # The numbers of the runs to be analysed - empty_runs = ( - "43868-43911" # 100K # The numbers of the empty runs to be subtracted - ) - mode = "SingleDifference" - - subEmptyFromRaw = False # Flag to control wether empty ws gets subtracted from raw - scaleEmpty = 1 # None or scaling factor - scaleRaw = 1 - - -class GeneralInitialConditions: - """Used to define initial conditions shared by both Back and Forward scattering""" - - # Sample slab parameters - vertical_width, horizontal_width, thickness = 0.1, 0.1, 0.001 # Expressed in meters - - -class BackwardInitialConditions(GeneralInitialConditions): - def __init__(self, ipFilesPath): - self.InstrParsPath = ipFilesPath / "ip2018_3.par" - - HToMassIdxRatio = 19.0620008206 # Set to zero or None when H is not present - massIdx = 0 - - # Masses, instrument parameters and initial fitting parameters - masses = np.array([12, 16, 27]) - # noOfMasses = len(masses) - - # Intensities, NCP widths, NCP centers - initPars = np.array([1, 12, 0.0, 1, 12, 0.0, 1, 12.5, 0.0]) - bounds = np.array( - [ - [0, np.nan], - [8, 16], - [-3, 1], - [0, np.nan], - [8, 16], - [-3, 1], - [0, np.nan], - [11, 14], - [-3, 1], - ] - ) - constraints = () - - noOfMSIterations = 3 # 4 - firstSpec = 3 # 3 - lastSpec = 134 # 134 - - maskedSpecAllNo = np.array([18, 34, 42, 43, 59, 60, 62, 118, 119, 133]) - - # Boolean Flags to control script - MSCorrectionFlag = True - GammaCorrectionFlag = False - - # # Parameters of workspaces in input_ws - tofBinning = "275.,1.,420" # Binning of ToF spectra - maskTOFRange = None - - transmission_guess = 0.8537 # Experimental value from VesuvioTransmission - multiple_scattering_order = 2 - number_of_events = 1.0e5 - - # Original data uses histogram data instead of point data - runHistData = True - normVoigt = False - - -class ForwardInitialConditions(GeneralInitialConditions): - def __init__(self, ipFilesPath): - self.InstrParsPath = ipFilesPath / "ip2018_3.par" - - masses = np.array([1.0079, 12, 16, 27]) - - # Intensities, NCP widths, NCP centers - initPars = np.array([1, 4.7, 0, 1, 12.71, 0.0, 1, 8.76, 0.0, 1, 13.897, 0.0]) - bounds = np.array( - [ - [0, np.nan], - [3, 6], - [-3, 1], - [0, np.nan], - [12.71, 12.71], - [-3, 1], - [0, np.nan], - [8.76, 8.76], - [-3, 1], - [0, np.nan], - [13.897, 13.897], - [-3, 1], - ] - ) - constraints = () - - noOfMSIterations = 0 # 4 - firstSpec = 144 # 144 - lastSpec = 182 # 182 - - # Boolean Flags to control script - MSCorrectionFlag = True - GammaCorrectionFlag = True - - maskedSpecAllNo = np.array([173, 174, 179]) - - tofBinning = "110,1,430" # Binning of ToF spectra - maskTOFRange = None - - transmission_guess = 0.8537 # Experimental value from VesuvioTransmission - multiple_scattering_order = 2 - number_of_events = 1.0e5 - - # Original data uses histogram data instead of point data - runHistData = True - normVoigt = False - - -class YSpaceFitInitialConditions: - showPlots = True - symmetrisationFlag = True - rebinParametersForYSpaceFit = "-25, 0.5, 25" # Needs to be symetric - fitModel = "Gaussian3D" # Options: 'SINGLE_GAUSSIAN', 'GC_C4', 'GC_C6', 'GC_C4_C6', 'DOUBLE_WELL', 'ANSIO_GAUSSIAN', 'Gaussian3D' - runMinos = True - globalFit = True # Performs global fit with Minuit by default - nGlobalFitGroups = 4 # Number or string "ALL" - maskTypeProcedure = "NAN" # Options: 'NCP', 'NAN', None - - -class UserScriptControls: - runRoutine = True - - # Choose main procedure to run - procedure = "FORWARD" # Options: None, "BACKWARD", "FORWARD", "JOINT" - - # Choose on which ws to perform the fit in y space - fitInYSpace = "FORWARD" # Options: None, "BACKWARD", "FORWARD", "JOINT" - - -class BootstrapInitialConditions: - runBootstrap = False diff --git a/EVSVesuvio/config/test_dir/experiment_cache/placeholder.txt b/EVSVesuvio/config/test_dir/experiments/placeholder.txt similarity index 100% rename from EVSVesuvio/config/test_dir/experiment_cache/placeholder.txt rename to EVSVesuvio/config/test_dir/experiments/placeholder.txt diff --git a/EVSVesuvio/config/test_dir/experiments/test_expr/placeholder.txt b/EVSVesuvio/config/test_dir/experiments/test_expr/placeholder.txt new file mode 100644 index 00000000..9a922348 --- /dev/null +++ b/EVSVesuvio/config/test_dir/experiments/test_expr/placeholder.txt @@ -0,0 +1 @@ +Empty file to retain directory \ No newline at end of file diff --git a/EVSVesuvio/config/test_dir/vesuvio.user.properties b/EVSVesuvio/config/test_dir/vesuvio.user.properties index 18228943..e8da98d0 100644 --- a/EVSVesuvio/config/test_dir/vesuvio.user.properties +++ b/EVSVesuvio/config/test_dir/vesuvio.user.properties @@ -1,4 +1,4 @@ # properties to be used in CI testing. caching.location = EVSVesuvio/config/test_dir -caching.experiment = experiment_cache +caching.experiment = test_expr caching.ipfolder = EVSVesuvio/config/ip_files