Merge branch 'lalinference_pipe_smarter' into 'master'

Make lalinference_pipe able to interpolate options

See merge request !174

lalapps/src/inspiral/posterior/lalinference_pipe_example.ini

@@ -109,46 +109,50 @@ ignore-science-segments=True
 [condor]
 # Replace with your own executable locations
 
-datafind=/home/albert.einstein/bin/gw_data_find
-mergeNSscript=/home/albert.einstein/bin/lalapps_nest2pos
-mergeMCMCscript=/home/albert.einstein/bin/cbcBayesMCMC2pos
-combinePTMCMCh5script=/home/albert.einstein/bin/cbcBayesCombinePTMCMCh5s
-resultspage=/home/albert.einstein/bin/cbcBayesPostProc
-segfind=/home/albert.einstein/bin/ligolw_segment_query
-ligolw_print=/home/albert.einstein/bin/ligolw_print
-coherencetest=/home/albert.einstein/bin/lalapps_coherence_test
-lalinferencenest=/home/albert.einstein/bin/lalinference_nest
-lalinferencemcmc=/home/albert.einstein/bin/lalinference_mcmc
-lalinferencebambi=/home/albert.einstein/bin/lalinference_bambi
-lalinferencedatadump=/home/albert.einstein/bin/lalinference_datadump
+# Can use this option to specify the installation location
+# and interpolate the exe paths
+lalsuite-install=/home/albert.einstein/opt/lalsuite/
+
+datafind=%(lalsuite-install)s/bin/gw_data_find
+mergeNSscript=%(lalsuite-install)s/bin/lalapps_nest2pos
+mergeMCMCscript=%(lalsuite-install)s/bin/cbcBayesMCMC2pos
+combinePTMCMCh5script=%(lalsuite-install)s/bin/cbcBayesCombinePTMCMCh5s
+resultspage=%(lalsuite-install)s/bin/cbcBayesPostProc
+segfind=%(lalsuite-install)s/bin/ligolw_segment_query
+ligolw_print=%(lalsuite-install)s/bin/ligolw_print
+coherencetest=%(lalsuite-install)s/bin/lalapps_coherence_test
+lalinferencenest=%(lalsuite-install)s/bin/lalinference_nest
+lalinferencemcmc=%(lalsuite-install)s/bin/lalinference_mcmc
+lalinferencebambi=%(lalsuite-install)s/bin/lalinference_bambi
+lalinferencedatadump=%(lalsuite-install)s/bin/lalinference_datadump
 # Bayeswave code from https://wiki.ligo.org/Bursts/BayesWave/RunningBayesWaveBurst
 # Disabled by default, uncomment line below to use it
-# bayeswave=/home/albert.einstein/bin/bayeswave
+# bayeswave=%(lalsuite-install)s/bin/bayeswave
 
 # Skyareas code from https://github.com/farr/skyarea
 # Comment line below not to use it
-skyarea=/home/albert.einstein/bin/run_sky_area
+skyarea=%(lalsuite-install)s/bin/run_sky_area
 
 # To have 2D sky PP plot while running the PP pipeline both skyareas above and processareas below must be given
 # Comment line below not to use it
-processareas=/home/albert.einstein/bin/process_areas
+processareas=%(lalsuite-install)s/bin/process_areas
 
 # ROQ weight computation, requires roq_b_matrix_directory in the [paths] section
 # Disabled by default, uncomment line below to use it
-# computeroqweights=/home/albert.einstein/bin/lalapps_compute_roq_weights
+# computeroqweights=%(lalsuite-install)s/bin/lalapps_compute_roq_weights
 
 # MPIrun only needed for MCMC, if not available use /bin/true
-mpirun=/home/albert.einstein/bin/mpirun
+mpirun=%(lalsuite-install)s/bin/mpirun
 
 # Wrapper script for MPI jobs
-mpiwrapper=/home/albert.einstein/bin/lalinference_mpi_wrapper
+mpiwrapper=%(lalsuite-install)s/bin/lalinference_mpi_wrapper
 
 # GraceDB only needed for online analysis, if not available use /bin/true
-gracedb=/home/albert.einstein/bin/gracedb
+gracedb=%(lalsuite-install)s/bin/gracedb
 
 # Scripts needed only for PP check pipeline
-ppanalysis=/home/albert.einstein/bin/cbcBayesPPAnalysis
-pos_to_sim_inspiral=/home/albert.einstein/bin/cbcBayesPosToSimInspiral
+ppanalysis=%(lalsuite-install)s/bin/cbcBayesPPAnalysis
+pos_to_sim_inspiral=%(lalsuite-install)s/bin/cbcBayesPosToSimInspiral
 
 # Queue information if needed to run on specific nodes
 #queue=

lalinference/python/lalinference_pipe.py

@@ -180,7 +180,7 @@ for sampler in samps:
 
       inifile=args[0]
 
-      cp=ConfigParser.ConfigParser()
+      cp=ConfigParser.SafeConfigParser()
       fp=open(inifile)
       cp.optionxform = str
       cp.readfp(fp)