Skip to content

Commit ded92e2

Browse files
authored
Merge pull request #34 from JeffersonLab/OSG
Osg
2 parents ff938ff + bf76792 commit ded92e2

File tree

7 files changed

+343
-84
lines changed

7 files changed

+343
-84
lines changed

MCwrapper/Generators/bggen_jpsi/particle.dat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@
1919
44 0.7755 0. 0 0 0 0
2020
80 0.7755 0.151 9 8 0 1
2121
82 1.232 0.118 14 8 0 0
22+
83 3.097 0. 2 3 0 2

MCwrapper/Generators/genEtaRegge/examples/eta548.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,3 @@ TEMPELECE TEMPCOHERENT TEMPCOLD TEMPRADTHICK
1010
3
1111
#GEANT ids of decay particles (1=gamma,7=pi0, 8=pi+, 9=pi-, 17=eta).
1212
1 2 3
13-
14-
15-

MCwrapper/MakeMC.csh

Lines changed: 99 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -85,35 +85,35 @@ setenv BGRATE $1
8585

8686

8787
#necessary to run swif, uses local directory if swif=0 is used
88-
if ( "$BATCHRUN" != "0" ) then
88+
if ( "$BATCHRUN" != "0" ) then
8989
# ENVIRONMENT
9090
echo $ENVIRONMENT
9191
echo pwd=$PWD
9292
mkdir -p $OUTDIR
9393
mkdir -p $OUTDIR/log
9494
endif
9595

96-
if (! -d $RUNNING_DIR) then
96+
if ( ! -d $RUNNING_DIR ) then
9797
mkdir $RUNNING_DIR
9898
endif
9999

100100
cd $RUNNING_DIR
101101

102-
if(! -d $RUNNING_DIR/${RUN_NUMBER}_${FILE_NUMBER}) then
102+
if ( ! -d $RUNNING_DIR/${RUN_NUMBER}_${FILE_NUMBER} ) then
103103
mkdir $RUNNING_DIR/${RUN_NUMBER}_${FILE_NUMBER}
104104
endif
105105

106106
cd $RUNNING_DIR/${RUN_NUMBER}_${FILE_NUMBER}
107107

108108
if ( "$ccdbSQLITEPATH" != "no_sqlite" ) then
109-
#cp $ccdbSQLITEPATH ./ccdb.sqlite
110-
setenv CCDB_CONNECTION sqlite:///$ccdbSQLITEPATH
109+
cp $ccdbSQLITEPATH ./ccdb.sqlite
110+
setenv CCDB_CONNECTION sqlite:///$PWD/ccdb.sqlite #$ccdbSQLITEPATH
111111
setenv JANA_CALIB_URL ${CCDB_CONNECTION}
112112
endif
113113

114114
if ( "$rcdbSQLITEPATH" != "no_sqlite" ) then
115-
#cp $rcdbSQLITEPATH ./rcdb.sqlite
116-
setenv RCDB_CONNECTION sqlite:///$rcdbSQLITEPATH
115+
cp $rcdbSQLITEPATH ./rcdb.sqlite
116+
setenv RCDB_CONNECTION sqlite:///$PWD/rcdb.sqlite #$rcdbSQLITEPATH
117117
endif
118118

119119
echo ""
@@ -362,7 +362,7 @@ endif
362362

363363
set bkglocstring=""
364364
set bkgloc_pre=`echo $BKGFOLDSTR | cut -c 1-4`
365-
365+
echo $BKGFOLDSTR
366366
if ( "$BKGFOLDSTR" == "DEFAULT" || "$bkgloc_pre" == "loc:" || "$BKGFOLDSTR" == "Random" ) then
367367
#find file and run:1
368368
echo "Finding the right file to fold in during MCsmear step"
@@ -380,7 +380,7 @@ if ( "$BKGFOLDSTR" == "DEFAULT" || "$bkgloc_pre" == "loc:" || "$BKGFOLDSTR" == "
380380

381381
if ( $RUN_NUMBER < 10000 ) then
382382
echo "Warning: random triggers do not exist for this run"
383-
exit
383+
exit 1
384384
endif
385385

386386
if ( "$bkgloc_pre" == "loc:" ) then
@@ -389,19 +389,21 @@ if ( "$BKGFOLDSTR" == "DEFAULT" || "$bkgloc_pre" == "loc:" || "$BKGFOLDSTR" == "
389389
else
390390
set bkglocstring="/cache/halld/""$runperiod""/sim/random_triggers/""run$formatted_runNumber""_random.hddm"
391391
endif
392-
392+
393393
if ( ! -f $bkglocstring ) then
394394
echo "Could not find mix-in file "$bkglocstring
395-
exit
395+
exit 1
396396
endif
397397
endif
398398

399399

400400
set recon_pre=`echo $CUSTOM_PLUGINS | cut -c1-4`
401401
set jana_config_file=`echo $CUSTOM_PLUGINS | sed -r 's/^.{5}//'`
402402

403-
if ( -f $jana_config_file ) then
404-
cp $jana_config_file ./jana_config.cfg
403+
if ( $recon_pre == "file" ) then
404+
if ( -f $jana_config_file ) then
405+
cp $jana_config_file ./jana_config.cfg
406+
endif
405407
endif
406408

407409
set gen_pre=""
@@ -411,29 +413,31 @@ if ( "$GENR" != "0" ) then
411413
if ( "$gen_pre" != "file" && "$GENERATOR" != "genr8" && "$GENERATOR" != "bggen" && "$GENERATOR" != "genEtaRegge" && "$GENERATOR" != "gen_2pi_amp" && "$GENERATOR" != "gen_pi0" && "$GENERATOR" != "gen_2pi_primakoff" && "$GENERATOR" != "gen_omega_3pi" && "$GENERATOR" != "gen_2k" && "$GENERATOR" != "bggen_jpsi" && "$GENERATOR" != "gen_ee" && "$GENERATOR" != "gen_ee_hb" && "$GENERATOR" != "particle_gun" ) then
412414
echo "NO VALID GENERATOR GIVEN"
413415
echo "only [genr8, bggen, genEtaRegge, gen_2pi_amp, gen_pi0, gen_omega_3pi, gen_2k, bggen_jpsi, gen_ee , gen_ee_hb, particl_gun] are supported"
414-
exit
416+
exit 1
415417
endif
416418

417419
if ( "$gen_pre" == "file" ) then
418420
set gen_in_file=`echo $GENERATOR | sed -r 's/^.{5}//'`
419421
echo "bypassing generation"
422+
set generator_return_code=0
420423
if ( -f $gen_in_file ) then
421424
echo "using pre-generated file: "$gen_in_file
422425
cp $gen_in_file ./$STANDARD_NAME.hddm
423426
else
424427
echo "cannot find file: "$gen_in_file
425-
exit
428+
exit 1
426429
endif
427-
else if ( "$GENERATOR" == "particle_gun") then
430+
else if ( "$GENERATOR" == "particle_gun" ) then
428431
echo "bypassing generation"
432+
set generator_return_code=0
429433
else
430434
if ( -f $CONFIG_FILE ) then
431435
echo "input file found"
432436
else if( "$GENERATOR" == "gen_ee" || "$GENERATOR" == "gen_ee_hb" ) then
433437
echo "Config file not applicable"
434438
else
435439
echo $CONFIG_FILE" does not exist"
436-
exit
440+
exit 1
437441
endif
438442
endif
439443

@@ -507,6 +511,7 @@ if ( "$GENR" != "0" ) then
507511
sed -i 's/TEMPCOHERENT/'$COHERENT_PEAK'/' $STANDARD_NAME.conf
508512
# RUN genr8 and convert
509513
genr8 -r$formatted_runNumber -M$EVT_TO_GEN -A$STANDARD_NAME.ascii < $STANDARD_NAME.conf #$config_file_name
514+
set generator_return_code=$status
510515
genr8_2_hddm $STANDARD_NAME.ascii
511516
else if ( "$GENERATOR" == "bggen" ) then
512517
set RANDOMnum=`bash -c 'echo $RANDOM'`
@@ -524,6 +529,7 @@ if ( "$GENR" != "0" ) then
524529

525530
ln -s $STANDARD_NAME.conf fort.15
526531
bggen
532+
set generator_return_code=$status
527533
mv bggen.hddm $STANDARD_NAME.hddm
528534
else if ( "$GENERATOR" == "genEtaRegge" ) then
529535
echo "RUNNING GENETAREGGE"
@@ -534,7 +540,8 @@ if ( "$GENR" != "0" ) then
534540
sed -i 's/TEMPMINGENE/'$GEN_MIN_ENERGY'/' $STANDARD_NAME.conf
535541
sed -i 's/TEMPMAXGENE/'$GEN_MAX_ENERGY'/' $STANDARD_NAME.conf
536542
genEtaRegge -N$EVT_TO_GEN -O$STANDARD_NAME.hddm -I$STANDARD_NAME.conf
537-
else if ( "$GENERATOR" == "gen_2pi_amp" ) then
543+
set generator_return_code=$status
544+
else if ( "$GENERATOR" == "gen_2pi_amp" ) then
538545
echo "RUNNING GEN_2PI_AMP"
539546
set optionals_line=`head -n 1 $STANDARD_NAME.conf | sed -r 's/.//'`
540547

@@ -549,6 +556,7 @@ if ( "$GENR" != "0" ) then
549556
echo $optionals_line
550557
echo gen_2pi_amp -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -p $COHERENT_PEAK -m $eBEAM_ENERGY $optionals_line
551558
gen_2pi_amp -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -p $COHERENT_PEAK -m $eBEAM_ENERGY $optionals_line
559+
set generator_return_code=$status
552560
else if ( "$GENERATOR" == "gen_omega_3pi" ) then
553561
echo "RUNNING GEN_OMEGA_3PI"
554562
set optionals_line=`head -n 1 $STANDARD_NAME.conf | sed -r 's/.//'`
@@ -564,24 +572,28 @@ if ( "$GENR" != "0" ) then
564572
echo $optionals_line
565573
echo gen_omega_3pi -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -m $eBEAM_ENERGY -p $COHERENT_PEAK $optionals_line
566574
gen_omega_3pi -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -m $eBEAM_ENERGY -p $COHERENT_PEAK $optionals_line
567-
else if ( "$GENERATOR" == "gen_2pi_primakoff" ) then
575+
set generator_return_code=$status
576+
else if ( "$GENERATOR" == "gen_2pi_primakoff" ) then
568577
echo "RUNNING GEN_2PI_PRIMAKOFF"
569578
set optionals_line=`head -n 1 $STANDARD_NAME.conf | sed -r 's/.//'`
570579
echo $optionals_line
571580
echo gen_2pi_primakoff -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -p $COHERENT_PEAK -m $eBEAM_ENERGY $optionals_line
572581
gen_2pi_primakoff -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -p $COHERENT_PEAK -m $eBEAM_ENERGY $optionals_line
573-
else if ( "$GENERATOR" == "gen_pi0" ) then
582+
set generator_return_code=$status
583+
else if ( "$GENERATOR" == "gen_pi0" ) then
574584
echo "RUNNING GEN_PI0"
575585
set optionals_line=`head -n 1 $STANDARD_NAME.conf | sed -r 's/.//'`
576586
echo $optionals_line
577587
gen_pi0 -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -p $COHERENT_PEAK -s $formatted_fileNumber -m $eBEAM_ENERGY $optionals_line
578-
else if ( "$GENERATOR" == "gen_2k" ) then
588+
set generator_return_code=$status
589+
else if ( "$GENERATOR" == "gen_2k" ) then
579590
echo "RUNNING GEN_2K"
580591
set optionals_line=`head -n 1 $STANDARD_NAME.conf | sed -r 's/.//'`
581592
#set RANDOMnum=`bash -c 'echo $RANDOM'`
582593
echo $optionals_line
583594
echo gen_2k -c $STANDARD_NAME.conf -o $STANDARD_NAME.hddm -hd $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -p $COHERENT_PEAK -m $eBEAM_ENERGY $optionals_line
584595
gen_2k -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -p $COHERENT_PEAK -m $eBEAM_ENERGY $optionals_line
596+
set generator_return_code=$status
585597
else if ( "$GENERATOR" == "bggen_jpsi" ) then
586598
set RANDOMnum=`bash -c 'echo $RANDOM'`
587599
echo Random Number used: $RANDOMnum
@@ -598,16 +610,19 @@ if ( "$GENR" != "0" ) then
598610

599611
ln -s $STANDARD_NAME.conf fort.15
600612
bggen_jpsi
613+
set generator_return_code=$status
601614
mv bggen.hddm $STANDARD_NAME.hddm
602615
else if ( "$GENERATOR" == "gen_ee" ) then
603616
set RANDOMnum=`bash -c 'echo $RANDOM'`
604617
echo "Random number used: "$RANDOMnum
605618
echo ee_mc -n$EVT_TO_GEN -R2 -b2 -l$GEN_MIN_ENERGY -u$GEN_MAX_ENERGY -t2 -r$RANDOMnum -omc_ee.hddm
606619
ee_mc -n$EVT_TO_GEN -R2 -b2 -l$GEN_MIN_ENERGY -u$GEN_MAX_ENERGY -t2 -r$RANDOMnum -omc_ee.hddm
620+
set generator_return_code=$status
607621
mv mc_ee.hddm $STANDARD_NAME.hddm
608622
else if ( "$GENERATOR" == "gen_ee_hb" ) then
609623
echo ee_mc_hb -N$RUN_NUMBER -n$EVT_TO_GEN
610624
ee_mc_hb -N$RUN_NUMBER -n$EVT_TO_GEN
625+
set generator_return_code=$status
611626
mv genOut.hddm $STANDARD_NAME.hddm
612627
endif
613628

@@ -617,7 +632,13 @@ if ( "$GENR" != "0" ) then
617632
exit 11
618633
endif
619634

620-
635+
if ( $generator_return_code != 0 ) then
636+
echo
637+
echo
638+
echo "Something went wrong with " "$GENERATOR"
639+
echo "status code: "$generator_return_code
640+
exit $generator_return_code
641+
endif
621642
#GEANT/smearing
622643

623644
if ( "$GEANT" != "0" ) then
@@ -639,7 +660,8 @@ if ( "$GENR" != "0" ) then
639660
if ( "$polarization_angle" == "-1" ) then
640661
sed -i 's/TEMPCOHERENT/'0'/' control'_'$formatted_runNumber'_'$formatted_fileNumber.in
641662
else
642-
sed -i 's/TEMPCOHERENT/'$COHERENT_PEAK'/' control'_'$formatted_runNumber'_'$formatted_fileNumber.in
663+
set Fortran_COHERENT_PEAK=`echo $COHERENT_PEAK | cut -c -7`
664+
sed -i 's/TEMPCOHERENT/'$Fortran_COHERENT_PEAK'/' control'_'$formatted_runNumber'_'$formatted_fileNumber.in
643665
endif
644666

645667
sed -i 's/TEMPIN/'$STANDARD_NAME.hddm'/' control'_'$formatted_runNumber'_'$formatted_fileNumber.in
@@ -687,16 +709,26 @@ if ( "$GENR" != "0" ) then
687709

688710
if ( "$GEANTVER" == "3" ) then
689711
hdgeant
712+
set geant_return_code=$status
690713
else if ( "$GEANTVER" == "4" ) then
691714
#make run.mac then call it below
692715
rm -f run.mac
693716
echo "/run/beamOn $EVT_TO_GEN" > run.mac
694717
echo "exit" >>! run.mac
695718
hdgeant4 -t$NUMTHREADS run.mac
719+
set geant_return_code=$status
696720
rm run.mac
697721
else
698722
echo "INVALID GEANT VERSION"
699-
exit
723+
exit 1
724+
endif
725+
726+
if ( $geant_return_code != 0 ) then
727+
echo
728+
echo
729+
echo "Something went wrong with hdgeant(4)"
730+
echo "status code: "$geant_return_code
731+
exit $geant_return_code
700732
endif
701733

702734
if ( ! -f ./$STANDARD_NAME'_geant'$GEANTVER'.hddm' ) then
@@ -707,20 +739,37 @@ if ( "$GENR" != "0" ) then
707739
if ( "$SMEAR" != "0" ) then
708740
echo "RUNNING MCSMEAR"
709741

710-
if ( "$BKGFOLDSTR" == "BeamPhotons" || "$BKGFOLDSTR" == "None" ) then
742+
if ( "$BKGFOLDSTR" == "BeamPhotons" || "$BKGFOLDSTR" == "None" || "$BKGFOLDSTR" == "TagOnly" ) then
711743
echo "running MCsmear without folding in random background"
712744
mcsmear -PTHREAD_TIMEOUT=300 -o$STANDARD_NAME'_geant'$GEANTVER'_smeared.hddm' $STANDARD_NAME'_geant'$GEANTVER'.hddm'
745+
set mcsmear_return_code=$status
713746
else if ( "$BKGFOLDSTR" == "DEFAULT" || "$BKGFOLDSTR" == "Random" ) then
714-
echo "mcsmear -PTHREAD_TIMEOUT=300 -o$STANDARD_NAME"\_"geant$GEANTVER"\_"smeared.hddm $STANDARD_NAME"\_"geant$GEANTVER.hddm $bkglocstring"\:"1"
715-
mcsmear -PTHREAD_TIMEOUT=300 -o$STANDARD_NAME\_geant$GEANTVER\_smeared.hddm $STANDARD_NAME\_geant$GEANTVER.hddm $bkglocstring\:1
747+
set fold_skip_num=`echo "$FILE_NUMBER * $PER_FILE" | bc`
748+
#set bkglocstring="/w/halld-scifs17exp/halld2/home/tbritton/MCwrapper_Development/converted.hddm"
749+
echo "mcsmear -PTHREAD_TIMEOUT=300 -o$STANDARD_NAME"\_"geant$GEANTVER"\_"smeared.hddm $STANDARD_NAME"\_"geant$GEANTVER.hddm $bkglocstring"\:"1""+"$fold_skip_num
750+
mcsmear -PTHREAD_TIMEOUT=300 -o$STANDARD_NAME\_geant$GEANTVER\_smeared.hddm $STANDARD_NAME\_geant$GEANTVER.hddm $bkglocstring\:1\+$fold_skip_num
751+
set mcsmear_return_code=$status
716752
else if ( "$bkgloc_pre" == "loc:" ) then
717-
echo "mcsmear -PTHREAD_TIMEOUT=300 -o$STANDARD_NAME"\_"geant$GEANTVER"\_"smeared.hddm $STANDARD_NAME"\_"geant$GEANTVER.hddm $bkglocstring"\:"1"
718-
mcsmear -PTHREAD_TIMEOUT=300 -o$STANDARD_NAME\_geant$GEANTVER\_smeared.hddm $STANDARD_NAME\_geant$GEANTVER.hddm $bkglocstring\:1
753+
set fold_skip_num=`echo "$FILE_NUMBER * $PER_FILE" | bc`
754+
755+
echo "mcsmear -PTHREAD_TIMEOUT=300 -o$STANDARD_NAME"\_"geant$GEANTVER"\_"smeared.hddm $STANDARD_NAME"\_"geant$GEANTVER.hddm $bkglocstring"\:"1""+"$fold_skip_num
756+
mcsmear -PTHREAD_TIMEOUT=300 -o$STANDARD_NAME\_geant$GEANTVER\_smeared.hddm $STANDARD_NAME\_geant$GEANTVER.hddm $bkglocstring\:1\+$fold_skip_num
757+
set mcsmear_return_code=$status
719758
else
720759
#trust the user and use their string
721760
echo 'mcsmear -PTHREAD_TIMEOUT=300 -o'$STANDARD_NAME'_geant'$GEANTVER'_smeared.hddm'' '$STANDARD_NAME'_geant'$GEANTVER'.hddm'' '$BKGFOLDSTR
722761
mcsmear -PTHREAD_TIMEOUT=300 -o$STANDARD_NAME'_geant'$GEANTVER'_smeared.hddm' $STANDARD_NAME'_geant'$GEANTVER'.hddm' $BKGFOLDSTR
762+
set mcsmear_return_code=$status
723763
endif
764+
765+
if ( $mcsmear_return_code != 0 ) then
766+
echo
767+
echo
768+
echo "Something went wrong with mcsmear"
769+
echo "status code: "$mcsmear_return_code
770+
exit $mcsmear_return_code
771+
endif
772+
724773
else
725774
cp $STANDARD_NAME'_geant'$GEANTVER'.hddm' $STANDARD_NAME'_geant'$GEANTVER'_smeared.hddm'
726775
endif
@@ -739,6 +788,8 @@ if ( "$GENR" != "0" ) then
739788
else if ( "$GENERATOR" == "gen_ee_hb" ) then
740789
rm CFFs_DD_Feb2012.dat
741790
rm ee.ascii
791+
rm cobrems.root
792+
rm tcs_gen.root
742793
endif
743794
if ( "$GENERATOR" != "particle_gun" && "$gen_pre" != "file" ) then
744795
rm $STANDARD_NAME.hddm
@@ -752,14 +803,18 @@ if ( "$GENR" != "0" ) then
752803

753804
if ( "$RECON" != "0" ) then
754805
echo "RUNNING RECONSTRUCTION"
755-
806+
756807
if ( "$recon_pre" == "file" ) then
757808
echo "using config file: "$jana_config_file
809+
758810
hd_root ./$STANDARD_NAME'_geant'$GEANTVER'_smeared.hddm' --config=jana_config.cfg -PNTHREADS=$NUMTHREADS
811+
set hd_root_return_code=$status
812+
#echo "STATUS: " $hd_root_return_code
759813
rm jana_config.cfg
760814
else
815+
761816
set pluginlist=("danarest" "monitoring_hists")
762-
817+
763818
if ( "$CUSTOM_PLUGINS" != "None" ) then
764819
set pluginlist=( "$pluginlist" "$CUSTOM_PLUGINS" )
765820
endif
@@ -773,13 +828,18 @@ if ( "$GENR" != "0" ) then
773828
echo "Running hd_root with:""$PluginStr"
774829
echo "hd_root ""$STANDARD_NAME"'_geant'"$GEANTVER"'_smeared.hddm'" -PPLUGINS=""$PluginStr ""-PNTHREADS=""$NUMTHREADS"
775830
hd_root ./$STANDARD_NAME'_geant'$GEANTVER'_smeared.hddm' -PPLUGINS=$PluginStr -PNTHREADS=$NUMTHREADS
776-
831+
set hd_root_return_code=$status
832+
833+
endif
834+
835+
if ( $hd_root_return_code != 0 ) then
836+
echo
837+
echo
838+
echo "Something went wrong with hd_root"
839+
echo "Status code: "$hd_root_return_code
840+
exit $hd_root_return_code
777841
endif
778-
#set hd_root_return_code=$?
779-
#if ( hd_root_return_code != 0 ) then
780-
# echo "Something went wrong with hd_root"
781-
# exit hd_root_return_code
782-
#endif
842+
783843
if ( -f dana_rest.hddm ) then
784844
mv dana_rest.hddm dana_rest_$STANDARD_NAME.hddm
785845
endif
@@ -812,6 +872,7 @@ if ( "$GENR" != "0" ) then
812872
set filecheck=`echo $current_files | grep -c $filetomv`
813873

814874
if ( "$filecheck" == "0" ) then
875+
815876
mv $filetomv $filename_root\_$STANDARD_NAME.root
816877
mv $PWD/$filename_root\_$STANDARD_NAME.root $OUTDIR/root/
817878
endif
@@ -823,7 +884,7 @@ endif
823884
rm -rf ccdb.sqlite
824885
rm -rf rcdb.sqlite
825886

826-
if ( "$gen_pre" != "file" ) then
887+
if ( "$gen_pre" != "file" && "$GENERATOR" != "gen_ee_hb" && "$GENERATOR" != "gen_ee" ) then
827888
mv $PWD/*.conf $OUTDIR/configurations/generation/
828889
endif
829890

0 commit comments

Comments
 (0)