Skip to content

Commit e95ff38

Browse files
raffaelladevitaraffaelladevita
authored
Merge pull request JeffersonLab#567 from JeffersonLab/development
Merging to master for new production release
2 parents 94a247a + 498f48b commit e95ff38

76 files changed

Lines changed: 1948 additions & 701 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bin/bg-merger‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
. `dirname $0`/env.sh
4+
5+
export MALLOC_ARENA_MAX=1
6+
7+
java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.analysis.eventmerger.EventMerger $*

‎bin/bos2hipo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#!/bin/sh -f
1+
#!/bin/sh
22

3-
source `dirname $0`/env.sh
3+
. `dirname $0`/env.sh
44

55
java -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" org.jlab.io.utils.Bos2HipoEventBank $*

‎bin/daqEventViewer‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#!/bin/sh -f
1+
#!/bin/sh
22

3-
source `dirname $0`/env.sh
3+
. `dirname $0`/env.sh
44

55
java -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.detector.examples.RawEventViewer $*

‎bin/dclayereffs-ana‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#!/bin/sh -f
1+
#!/bin/sh
22

3-
source `dirname $0`/env.sh
3+
. `dirname $0`/env.sh
44

55
java -Dsun.java2d.pmoffscreen=false -Xmx2048m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/utils/*:$CLAS12DIR/lib/services/*" org.jlab.service.dc.LayerEfficiencyAnalyzer $*

‎bin/decoder‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

3-
# This doesn't work in dash (Travis's /bin/sh):
4-
source `dirname $0`/env.sh
3+
. `dirname $0`/env.sh
54

6-
MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
5+
export MALLOC_ARENA_MAX=1
76

87
echo +-------------------------------------------------------------------------
98
echo "| DECODER GENERATION 4 (using HIPO-4 Library)"

‎bin/dict-maker‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

3-
source `dirname $0`/env.sh
3+
. `dirname $0`/env.sh
44

5-
MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
5+
export MALLOC_ARENA_MAX=1
66

77
java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.service.dc.TrackDictionaryMakerRNG $*

‎bin/dict-merge‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

3-
source `dirname $0`/env.sh
3+
. `dirname $0`/env.sh
44

5-
MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
5+
export MALLOC_ARENA_MAX=1
66

77
java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.service.dc.TrackDictionaryMerger $*

‎bin/dict-validate‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

3-
source `dirname $0`/env.sh
3+
. `dirname $0`/env.sh
44

5-
MALLOC_ARENA_MAX=1; export MALLOC_ARENA_MAX
5+
export MALLOC_ARENA_MAX=1
66

77
java -Xmx1536m -Xms1024m -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" org.jlab.service.dc.TrackDictionaryValidation $*

‎bin/env.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

3-
SCRIPT_DIR=`dirname $0`
4-
CLAS12DIR=$SCRIPT_DIR/../ ; export CLAS12DIR
3+
export CLAS12DIR=`dirname $0`/..
54

65
# Set default field maps (but do not override user's env):
76
if [ -z "$COAT_MAGFIELD_TORUSMAP" ]; then

‎bin/evio-viewer‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#!/bin/sh -f
1+
#!/bin/sh
22

3-
source `dirname $0`/env.sh
3+
. `dirname $0`/env.sh
44

55
java -cp "$CLAS12DIR/lib/clas/*" org.jlab.coda.eventViewer.EventTreeFrame $*

0 commit comments

Comments
 (0)