Merge pull request #19 from Eventdisplay/prod5-vts

Prod5 vts

Author: GernotMaier

analysis/CTA.EFFAREA.qsub_analyse_list.sh

@@ -351,6 +351,8 @@ do
                  ${EVNDISPSYS}/bin/writeParticleRateFilesFromEffectiveAreas  $ARRAY cone $RECID $QCDIR $TMPDIR $AXDIR > $LLOG
              fi
          fi
+         echo "END writeParticleRateFilesFromEffectiveAreas"
+         tail $LLOG
     fi
 ###############################################################################
 # create cut file
@@ -442,7 +444,9 @@ do
       fi
 # fill IRFs only
       echo "* ENERGYRECONSTRUCTIONMETHOD 1" >> $MSCF
-      echo "* ENERGYAXISBINS 60" >> $MSCF
+      echo "* ENERGYAXISBINS 60 -2. 4." >> $MSCF
+      echo "* ENERGYAXISBINHISTOS 25 -1.9 3.1" >> $MSCF
+      echo "* ANGULARRESOLUTIONBINHISTOS 100 -4. 1." >> $MSCF
       echo "* ENERGYRECONSTRUCTIONQUALITY 0" >> $MSCF
 # one azimuth bin only
       echo "* AZIMUTHBINS $AZBINS" >> $MSCF
@@ -522,6 +526,9 @@ do
           touch $OLOG.SMALLFILE
           mv -v $OFIX.root ${ODIR}/
           continue
+      # remove possilble leftover SMALL file
+      else
+         rm -f $OLOG.SMALLFILE
       fi
 
   ##############################

analysis/CTA.EFFAREA.sub_analyse_list.sh

@@ -164,9 +164,9 @@ do
      else
          if [ $DSET = *"LaPalma"* ]
          then
-             qsub $QSUBOPT -l h_cpu=11:29:00 -l h_rss=3000M -l tmpdir_size=15G  -V -t 1-6:1 -o $QDIR -e $QDIR "$QSHELLDIR/$FNAM.sh"
+             qsub $QSUBOPT -l h_cpu=11:29:00 -l h_rss=4000M -l tmpdir_size=15G  -V -t 1-6:1 -o $QDIR -e $QDIR "$QSHELLDIR/$FNAM.sh"
          else
-             qsub $QSUBOPT -l h_cpu=45:29:00 -l h_rss=3000M -l tmpdir_size=15G  -V -t 1-6:1 -o $QDIR -e $QDIR "$QSHELLDIR/$FNAM.sh"
+             qsub $QSUBOPT -l h_cpu=45:29:00 -l h_rss=4000M -l tmpdir_size=15G  -V -t 1-6:1 -o $QDIR -e $QDIR "$QSHELLDIR/$FNAM.sh"
          fi
      fi
 done

analysis/CTA.WPPhysWriter.qsub.sh

@@ -36,11 +36,11 @@ then
    DE=$(grep "error filling" $OXUTNAME.$AXRRAY.$OXBSTIME.log)
    DF=$(grep "error, cannot find effective area tree" $OXUTNAME.$AXRRAY.$OXBSTIME.log)
    if [[ -z ${DE} ]] && [[ -z ${DF} ]]; then
-       bzip2 -f $OXUTNAME.$AXRRAY.$OXBSTIME.log
        # root file
        DROOT=$(cat $OXUTNAME.$AXRRAY.$OXBSTIME.log | grep "writing histograms" | awk '{print $4}')
        if [[ -e ${DROOT} ]]; then
-           $EVNDISPSYS/bin/logFile IRFLog $OXUTNAME.$AXRRAY.$OXBSTIME.log
+           $EVNDISPSYS/bin/logFile IRFLog ${DROOT} $OXUTNAME.$AXRRAY.$OXBSTIME.log
+           rm -f $OXUTNAME.$AXRRAY.$OXBSTIME.log
        fi
    fi
 fi