Changeset d3fb80d in git

Timestamp:

Sep 30, 2016, 2:43:39 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

13cb1b6

Parents:

4d128b9

Message:

removed now useless condition for non simple calorimeter

File:

• examples/validation.sh (modified) (2 diffs)

examples/validation.sh

@@ -43 +43 @@
 outpdf=$mainoutputdir/${output%.*}.pdf
 
-
 mkdir -p $outputroot
 mkdir -p $mainoutputdir/www/fig
@@ -72 +71 @@
 ./Validation $outputroot/particleGun_pion_$cardlabel.root $outputroot/particleGun_electron_$cardlabel.root $outputroot/particleGun_muon_$cardlabel.root $outputroot/particleGun_photon_$cardlabel.root $outputroot/particleGun_neutron_$cardlabel.root $outputroot/particleGun_jet_$cardlabel.root $outputroot/particleGun_bjet_$cardlabel.root $outputroot/particleGun_cjet_$cardlabel.root $outputroot/particleGun_taujet_$cardlabel.root $mainoutputdir/$output $version
 
-echo $outpdf
-if grep -q SimpleCalorimeter "$1"; then
-  ./CaloGrid $1 ECal
-  ./CaloGrid $1 HCal
-  gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=tmp/tmp1.pdf $outpdf ECal.pdf  
-  gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=$outpdf tmp/tmp1.pdf HCal.pdf
-  mv ECal.pdf $mainoutputdir/www/fig/img_ecal.pdf 
-  mv ECal.png $mainoutputdir/www/fig/img_ecal.png 
-  mv HCal.pdf $mainoutputdir/www/fig/img_hcal.pdf
-  mv HCal.png $mainoutputdir/www/fig/img_hcal.png
-else 
-  ./CaloGrid $1 Calorimeter
-  gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=tmp/tmp1.pdf $outpdf Calorimeter.pdf
-  mv Calorimeter.pdf $mainoutputdir/www/fig/img_ecal.pdf
-  mv Calorimeter.png $mainoutputdir/www/fig/img_ecal.png
-fi
+
+# produce calo grid plots 
+./CaloGrid $1 ECal
+./CaloGrid $1 HCal
+gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=tmp/tmp1.pdf $outpdf ECal.pdf  
+gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=$outpdf tmp/tmp1.pdf HCal.pdf
+mv ECal.pdf $mainoutputdir/www/fig/img_ecal.pdf 
+mv ECal.png $mainoutputdir/www/fig/img_ecal.png 
+mv HCal.pdf $mainoutputdir/www/fig/img_hcal.pdf
+mv HCal.png $mainoutputdir/www/fig/img_hcal.png