Commit d96a0e21 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

add shared data files and configure scripts to use them

parent 014469af

dockerfiles/Dockerfile

+6 −2
Original line number Diff line number Diff line
@@ -11,13 +11,17 @@ RUN tar -xvf ./mantidworkbench-6.7.0.tar.xz 
RUN ln -s /mantidworkbench/bin/python /mantidworkbench/bin/mantidpython



ENV PATH=$PATH:/mantidworkbench/bin

ENV PYTHONPATH=$PYTHONPATH:/app/lib/ISAW_PythonSources/Lib:/app/lib/Python3Library

ENV PYTHONPATH=$PYTHONPATH:/lib/ISAW_PythonSources/Lib:/lib/Python3Library



COPY mantid.local.properties /etc/mantid.local.properties



COPY /data /data



COPY /src /app

COPY /lib /lib



RUN chmod og+rwX -R /data /app /lib



ENV SNS_TOPAZ_SHARED_FOLDER="/data"



WORKDIR /app

src/ReduceSCD_OneRun.py

+5 −1
Original line number Diff line number Diff line
@@ -172,7 +172,11 @@ cylinder_length = params_dictionary[ "cylinder_length" ] 
read_UB                   = params_dictionary[ "read_UB" ]

UB_filename               = params_dictionary[ "UB_filename" ]



moderator_coefficients_file = params_dictionary.get("moderator_coefficients_file","/SNS/TOPAZ/shared/ProfileFitting/franz_coefficients_2017.dat")

shared_folder = os.environ.get("SNS_TOPAZ_SHARED_FOLDER", "/SNS/TOPAZ/shared")

shared_folder = os.environ.get("SNS_TOPAZ_SHARED_FOLDER", "/SNS/TOPAZ/shared")

fname = shared_folder+'/ProfileFitting/franz_coefficients_2017.dat'



moderator_coefficients_file = params_dictionary.get("moderator_coefficients_file", fname)

minppl_frac                 = float(params_dictionary.get("minppl_frac",'0.9'))

maxppl_frac                 =float(params_dictionary.get("maxppl_frac",'1.1'))

frac_stop                   =float(params_dictionary.get("frac_stop",'0.06'))

src/mod3/topaz_reduction_mod.py

+2 −1
Original line number Diff line number Diff line
@@ -208,7 +208,8 @@ logFile.write( '---- ------ -----\n') 
#	J. Appl. Cryst. 1987, 20, 120-122.

        

#filename = XsecDirectory + 'NIST_cross-sections.dat'

nistdatafname = '/SNS/TOPAZ/shared/calibrations/NIST_cross-sections.dat'

shared_folder = os.environ.get("SNS_TOPAZ_SHARED_FOLDER","/SNS/TOPAZ/shared")

nistdatafname = shared_folder+'/calibrations/NIST_cross-sections.dat'



# begin loop through each atom in the formula

for i in range(numberOfIsotopes):