Merge pull request #65 from fact-project/forSPEonMCs

add option to allways asume yes

Author: maxnoe

erna/scripts/process_fact_data.py

@@ -47,8 +47,9 @@ def make_jobs(jar, xml, aux_source_path, output_directory, df_mapping,  engine,
 @click.option('--conditions',  help='Name of the data conditions as given in datacheck_conditions.py e.g standard', default='standard')
 @click.option('--max_delta_t', default=30,  help='Maximum time difference (minutes) allowed between drs and data files.', type=click.INT)
 @click.option('--local', default=False,is_flag=True,   help='Flag indicating whether jobs should be executed localy .')
+@click.option('--yes', help="Assume 'yes'if your asked to continue processing and start jobs", default=False, is_flag=True)
 @click.password_option(help='password to read from the always awesome RunDB')
-def main(earliest_night, latest_night, data_dir, jar, xml, aux_source, out, queue, walltime, engine, num_runs, vmem, log_level, port, source, conditions, max_delta_t, local, password):
+def main(earliest_night, latest_night, data_dir, jar, xml, aux_source, out, queue, walltime, engine, num_runs, vmem, log_level, port, source, conditions, max_delta_t, local, yes, password):
 
     level=logging.INFO
     if log_level is 'DEBUG':
@@ -82,7 +83,8 @@ def main(earliest_night, latest_night, data_dir, jar, xml, aux_source, out, queu
     logger.warn("Missing {} dataruns due to missing datafiles".format(len(df_runs_missing)))
 
     logger.info("Would process {} jobs with {} runs per job".format(len(df_runs)//num_runs, num_runs))
-    click.confirm('Do you want to continue processing and start jobs?', abort=True)
+    if not yes:
+        click.confirm('Do you want to continue processing and start jobs?', abort=True)
 
     job_list = make_jobs(jarpath, xmlpath, aux_source_path, output_directory, df_runs,  engine, queue, vmem, num_runs, walltime)
     job_outputs = gridmap.process_jobs(job_list, max_processes=len(job_list), local=local)

erna/scripts/process_fact_data_qsub.py

@@ -69,10 +69,11 @@ def read_outputs_to_list(job_output_paths):
 @click.option('--conditions',  help='Name of the data conditions as given in datacheck_conditions.py e.g std', default='data')
 @click.option('--max_delta_t', default=30,  help='Maximum time difference (minutes) allowed between drs and data files.', type=click.INT)
 @click.option('--local', default=False,is_flag=True,   help='Flag indicating whether jobs should be executed localy .')
+@click.option('--yes', help="Assume 'yes'if your asked to continue processing and start jobs", default=False, is_flag=True)
 @click.password_option(help='password to read from the always awesome RunDB')
 def main(earliest_night, latest_night, data_dir, jar, xml, aux_source, out, queue, mail,
          walltime, engine, num_runs, qjobs, vmem, log_level, port, source, conditions,
-         max_delta_t, local, password):
+         max_delta_t, local, yes, password):
 
     level=logging.INFO
     if log_level is 'DEBUG':
@@ -102,7 +103,8 @@ def main(earliest_night, latest_night, data_dir, jar, xml, aux_source, out, queu
     df_loaded.to_hdf(out+".tmp", "loaded", mode="a")
 
     logger.info("Processing {} jobs with {} runs per job.".format(int(len(df_loaded)/num_runs), num_runs))
-    click.confirm('Do you want to continue processing and start jobs?', abort=True)
+    if not yes:
+        click.confirm('Do you want to continue processing and start jobs?', abort=True)
 
     #ensure that the max number of queuable jobs is smaller than the total number of jobs
     if qjobs > len(df_loaded):

erna/scripts/process_fact_mc.py

@@ -94,7 +94,9 @@ def make_jobs(jar, xml, data_paths, drs_paths,
 @click.option('--local_output_format', default="{basename}_{num}.json", help="Give the file format for the local output funktionality."
               + "%b will replace the out filename and %[1-9]n the given local number."
               + "Default is: '{basename}_{num}.json'.Only works with option --local_output. ")
-def main( jar, xml, out, mc_path, queue, walltime, engine, num_jobs, vmem, log_level, port, local, local_output, mcdrs, mcwildcard, local_output_format):
+@click.option('--yes', help="Assume 'yes'if your asked to continue processing and start jobs", default=False, is_flag=True)
+def main( jar, xml, out, mc_path, queue, walltime, engine, num_jobs, vmem, log_level, port, local, local_output, mcdrs, mcwildcard, local_output_format, yes):
+
     '''
     Script to execute fact-tools on MonteCarlo files. Use the MC_PATH argument to specifiy the folders containing the MC
     '''
@@ -140,7 +142,8 @@ def main( jar, xml, out, mc_path, queue, walltime, engine, num_jobs, vmem, log_l
         logger.error("You specified more jobs than files. This doesn't make sense.")
         return
 
-    click.confirm('Do you want to continue processing and start jobs?', abort=True)
+    if not yes:
+        click.confirm('Do you want to continue processing and start jobs?', abort=True)
 
     mc_paths_array = np.array(files)
     drs_paths_array = np.repeat(np.array(drspath), len(mc_paths_array))