Merge pull request #567 from JeffersonLab/development

Merging to master for new production release

bin/bg-merger

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+. `dirname $0`/env.sh 
+
+export MALLOC_ARENA_MAX=1
+
+java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.analysis.eventmerger.EventMerger $*

bin/bos2hipo

@@ -1,5 +1,5 @@
-#!/bin/sh -f
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
 java -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" org.jlab.io.utils.Bos2HipoEventBank $*

bin/daqEventViewer

@@ -1,5 +1,5 @@
-#!/bin/sh -f
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
 java -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.detector.examples.RawEventViewer $*

bin/dclayereffs-ana

@@ -1,5 +1,5 @@
-#!/bin/sh -f
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
 java -Dsun.java2d.pmoffscreen=false -Xmx2048m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/utils/*:$CLAS12DIR/lib/services/*" org.jlab.service.dc.LayerEfficiencyAnalyzer $*

bin/decoder

@@ -1,9 +1,8 @@
-#!/bin/bash
+#!/bin/sh
 
-# This doesn't work in dash (Travis's /bin/sh):
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
-MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
+export MALLOC_ARENA_MAX=1
 
 echo +-------------------------------------------------------------------------
 echo "| DECODER GENERATION 4 (using HIPO-4 Library)"

bin/dict-maker

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
-MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
+export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.service.dc.TrackDictionaryMakerRNG $*

bin/dict-merge

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
-MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
+export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.service.dc.TrackDictionaryMerger $*

bin/dict-validate

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
-MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
+export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.service.dc.TrackDictionaryValidation $*

bin/env.sh

@@ -1,7 +1,6 @@
-#!/bin/bash
+#!/bin/sh
 
-SCRIPT_DIR=`dirname $0`
-CLAS12DIR=$SCRIPT_DIR/../ ; export CLAS12DIR
+export CLAS12DIR=`dirname $0`/..
 
 # Set default field maps (but do not override user's env):
 if [ -z "$COAT_MAGFIELD_TORUSMAP" ]; then

bin/evio-viewer

@@ -1,5 +1,5 @@
-#!/bin/sh -f
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
 java -cp "$CLAS12DIR/lib/clas/*" org.jlab.coda.eventViewer.EventTreeFrame $*

bin/evio2hipo

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
-MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
+export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" org.jlab.clas.reco.io.EvioHipoEvent4 $*

bin/eviocure

@@ -1,7 +1,7 @@
-#!/bin/sh -f
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
-MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
+export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" org.jlab.io.utils.EvioCure $*

bin/eviodump

@@ -1,5 +1,5 @@
-#!/bin/sh -f
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
 java -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" org.jlab.io.utils.DataSourceDump $*

bin/hadd

@@ -1,5 +1,5 @@
-#!/bin/sh -f
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
 java -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" org.jlab.groot.data.TDirectory $*

bin/hipo-browser

@@ -1,5 +1,5 @@
-#!/bin/sh -f
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
 java -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" org.jlab.groot.ui.TBrowser $*

bin/hipo-utils

@@ -1,7 +1,7 @@
-#!/bin/sh -f
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
-MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
+export MALLOC_ARENA_MAX=1
 
 java -Xmx2048m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" org.jlab.jnp.hipo4.utils.HipoUtilities $*

bin/kpp-plots

@@ -1,5 +1,5 @@
-#!/bin/sh -f
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
 java -Dsun.java2d.pmoffscreen=false -Xmx2048m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/utils/*:$CLAS12DIR/lib/services/*" org.clas.viewer.KPPViewer $*

bin/mon12

@@ -1,5 +1,5 @@
-#!/bin/sh -f
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
 java -Dsun.java2d.pmoffscreen=false -Xmx2048m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/utils/*:$CLAS12DIR/lib/services/*" org.clas.viewer.EventViewer $*

bin/postprocess

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
-MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
+export MALLOC_ARENA_MAX=1
 
 java -Xmx768m -Xms768m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.analysis.postprocess.Tag1ToEvent $*

bin/rebuild-scalers

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
-MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
+export MALLOC_ARENA_MAX=1
 
 java -Xmx768m -Xms768m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.analysis.postprocess.RebuildScalers $*

bin/recon-util

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
-MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
+export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.clas.reco.EngineProcessor $*

bin/run-groovy

@@ -1,16 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
-source `dirname $0`/env.sh 
+. `dirname $0`/env.sh 
 
-CLARA_HOME=`dirname $0`/..
-CLAS12DIR=`dirname $0`/..
-CLAS12DIR=`dirname $0`/.. ; export CLAS12DIR
+export CLAS12DIR=`dirname $0`/..
 
-CLARA_SERVICES=$CLAS12DIR/lib/services ; export CLARA_SERVICES
-
-#JYTHONPATH=${CLAS12DIR}/lib/jython
-#echo ${JYTHONPATH}
-
 #--------------------------------------------------------------
 # Adding supporting COAT jar files
 for i in `ls -a $CLAS12DIR/lib/clas/*.jar`
@@ -56,5 +49,5 @@ echo "*    Version : 3a  Release : 2016       *"
 echo "*****************************************"
 echo " "
 echo " "
-JAVA_OPTS="-Dsun.java2d.pmoffscreen=false -Xms1024m -Xmx2048m"; export JAVA_OPTS
+export JAVA_OPTS="-Dsun.java2d.pmoffscreen=false -Xms1024m -Xmx2048m"
 groovy -cp "$JYPATH" $*

bin/trigger-filter

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+. `dirname $0`/env.sh 
+
+export MALLOC_ARENA_MAX=1
+
+java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.analysis.eventmerger.RandomTriggerFilter $*

bin/trigger-splitter

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+. `dirname $0`/env.sh 
+
+export MALLOC_ARENA_MAX=1
+
+java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.analysis.eventmerger.RandomTriggerSplit $*

common-tools/clas-analysis/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.clas</groupId>
   <artifactId>clas-analysis</artifactId>
-  <version>6.5.8-SNAPSHOT</version>
+  <version>6.5.9-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>6.5.8-SNAPSHOT</version>
+    <version>6.5.9-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -30,31 +30,31 @@
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>
-      <version>6.5.8-SNAPSHOT</version>
+      <version>6.5.9-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-physics</artifactId>
-      <version>6.5.8-SNAPSHOT</version>
+      <version>6.5.9-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-io</artifactId>
-      <version>6.5.8-SNAPSHOT</version>
+      <version>6.5.9-SNAPSHOT</version>
     </dependency> 
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-geometry</artifactId>
-      <version>6.5.8-SNAPSHOT</version>
+      <version>6.5.9-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-detector</artifactId>
-      <version>6.5.8-SNAPSHOT</version>
+      <version>6.5.9-SNAPSHOT</version>
     </dependency>
 
     <dependency>