added option for default modules versions

diff --git a/AliGeant4/config/test_create.sh b/AliGeant4/config/test_create.sh
index d1d2806f7cf348698abc63f3bdd26e351913e0c0..a5331f01c37379f9718e18f859c892263b2b6c1c 100755 (executable)
--- a/AliGeant4/config/test_create.sh
+++ b/AliGeant4/config/test_create.sh
@@ -55,7 +55,7 @@ if [ "$DIR" = "ALL" ]; then
       VER=0
       until [ "$VER" = "$MAX" ] ; do
         if [ -f "Ali"$DIR"v"$VER".cxx" ]; then
-          echo "test_create_in.sh $DIR v$VER test$GEN$VIS"
+          #echo "test_create_in.sh $DIR v$VER test$GEN$VIS"
           test_create_in.sh $DIR -d $VER -g $GEN -v $VIS
         fi
         let VER=$VER+1
@@ -72,7 +72,7 @@ else
       VER=0
       until [ "$VER" = "$MAX" ] ; do
         if [ -f $SRC/$DIR/"Ali"$MODULE"v"$VER".cxx" ]; then
-          echo "test_create_struct.sh $MODULE v$VER test$GEN$VIS"
+          #echo "test_create_struct.sh $MODULE v$VER test$GEN$VIS"
           test_create_struct.sh $MODULE -d $VER -g $GEN -v $VIS
        fi  
         let VER=$VER+1
@@ -80,18 +80,45 @@ else
     done
   else
   
-# specified detector only
-    if [ -d $SRC/$DIR ] ; then    
-    cd $SRC/$DIR
-    VER=0
-      until [ "$VER" = "$MAX" ] ; do
-        if [ -f "Ali"$DIR"v"$VER".cxx" ]; then
-          echo "test_create_in.sh $DIR v$VER test$GEN$VIS"
+# all detectors with default versions only
+    if [ "$DIR" = "ALL_DEFAULT" ]; then
+      cd $SRC
+      for DIR in `ls`; do
+        if [ -d $DIR ]; then
+          cd $SRC/$DIR
+          VER="d"
+          #echo "test_create_in.sh $DIR v$VER test$GEN$VIS"
           test_create_in.sh $DIR -d $VER -g $GEN -v $VIS
         fi
-        let VER=$VER+1
-      done 
-      cd $TO     
+        cd $SRC    
+      done
+    else
+
+# loop over all structures with default versions only
+      if [ "$DIR" = "STRUCT_DEFAULT" ]; then
+        DIR="STRUCT"
+        cd $TO/$DIR
+        for MODULE in `ls`; do
+          VER="d"
+          #echo "test_create_struct.sh $MODULE v$VER test$GEN$VIS"
+          test_create_struct.sh $MODULE -d $VER -g $GEN -v $VIS
+        done
+      else
+  
+# specified detector only
+        if [ -d $SRC/$DIR ]; then    
+          cd $SRC/$DIR
+          VER=0
+          until [ "$VER" = "$MAX" ] ; do
+            if [ -f "Ali"$DIR"v"$VER".cxx" ]; then
+              #echo "test_create_in.sh $DIR v$VER test$GEN$VIS"
+              test_create_in.sh $DIR -d $VER -g $GEN -v $VIS
+            fi
+            let VER=$VER+1
+          done 
+          cd $TO     
+        fi
+      fi
     fi
   fi    
 fi

diff --git a/AliGeant4/config/test_create_in.sh b/AliGeant4/config/test_create_in.sh
index 4faaf7d50c182223aa597ed7dd34e09b96ab4bef..1b386598a9cec24a70b61af259c1736fae91966b 100755 (executable)
--- a/AliGeant4/config/test_create_in.sh
+++ b/AliGeant4/config/test_create_in.sh
@@ -39,6 +39,11 @@ CURDIR=`pwd`
 
 SRC=$ALICE_ROOT
 TO=$AG4_INSTALL/"test"
+if [ "$VER" = "d" ]; then 
+ VER_REPLACE=""
+else
+ VER_REPLACE="$VER"
+fi
 
 # test if corresponding version order number
 # is defined
@@ -47,9 +52,13 @@ IS_VERSION="NO"
 if [ -f "Ali"$DIR"v"$VER".cxx" ]; then
   IS_VERSION="YES"
 else
-  if [ -f "Ali"$DIR".cxx" && "$VER" = "0" ]; then
+  if [ -f "Ali"$DIR".cxx" -a "$VER" = "0" ]; then
     IS_VERSION="YES" 
-  fi  
+  else
+    if [ "$VER" = "d" -a -d "$TO/$DIR" -a "$DIR" != "STRUCT" ]; then 
+      IS_VERSION="YES"
+    fi
+  fi 
 fi
 if [ "$IS_VERSION" = "NO" ]; then
   cd $CURDIR
@@ -59,9 +68,9 @@ cd $TO
 
 # create basic test macro
 if [ "$VIS" = "0" ]; then 
-  cat $AG4_INSTALL/config/test_default_det_novis.in | sed s/NNN/$VER/g | sed s/WWW/$VER/g | sed s/GGG/$GEN/g |  sed s/VVV/$VIS/g | sed s/XXX/$DIR/g > $TO/$DIR"/v"$VER"_test"$GEN""$VIS".in"
+  cat $AG4_INSTALL/config/test_default_det_novis.in | sed s/NNN/$VER_REPLACE/g | sed s/WWW/$VER_REPLACE/g | sed s/GGG/$GEN/g |  sed s/VVV/$VIS/g | sed s/XXX/$DIR/g > $TO/$DIR"/v"$VER"_test"$GEN""$VIS".in"
 else
-  cat $AG4_INSTALL/config/test_default_det_vis.in | sed s/NNN/$VER/g | sed s/WWW/$VER/g | sed s/GGG/$GEN/g |  sed s/VVV/$VIS/g | sed s/XXX/$DIR/g > $TO/$DIR"/v"$VER"_test"$GEN""$VIS".in"
+  cat $AG4_INSTALL/config/test_default_det_vis.in | sed s/NNN/$VER_REPLACE/g | sed s/WWW/$VER_REPLACE/g | sed s/GGG/$GEN/g |  sed s/VVV/$VIS/g | sed s/XXX/$DIR/g > $TO/$DIR"/v"$VER"_test"$GEN""$VIS".in"
 # create visualisation macro (if it does not yet exist)
   if [ ! -f $TO/$DIR/vis_test$VIS".in" ]; then
     cp $AG4_INSTALL/config/test_default_vis$VIS.in $TO/$DIR/vis_test$VIS.in
@@ -73,4 +82,5 @@ if [ ! -f $TO/$DIR/gen_test$GEN".in" ]; then
   cp $AG4_INSTALL/config/test_default_gen$GEN.in $TO/$DIR/gen_test$GEN.in
 fi
 
+echo "test_create_in.sh $DIR v$VER test$GEN$VIS"
 cd $CURDIR

diff --git a/AliGeant4/config/test_create_struct.sh b/AliGeant4/config/test_create_struct.sh
index be5ed631a74acf628ff6b2308bea03809da90aea..31ff4f8a02bea0a23134dc3507b08f7e18d5f404 100755 (executable)
--- a/AliGeant4/config/test_create_struct.sh
+++ b/AliGeant4/config/test_create_struct.sh
@@ -39,6 +39,12 @@ CURDIR=`pwd`
 
 SRC=$ALICE_ROOT/STRUCT
 TO=$AG4_INSTALL/"test"/STRUCT
+if [ "$VER" = "d" ]; then 
+  VER_REPLACE=""
+else
+  VER_REPLACE="$VER"
+fi
+
 
 # test if corresponding version order number
 # is defined
@@ -47,9 +53,13 @@ IS_VERSION="NO"
 if [ -f "Ali"$MOD"v"$VER".cxx" ]; then
   IS_VERSION="YES"
 else
-  if [ -f "Ali"$MOD".cxx" && "$VER" = "0" ]; then
+  if [ -f "Ali"$MOD".cxx" -a "$VER" = "0" ]; then
     IS_VERSION="YES" 
-  fi  
+  else
+    if [ "$VER" = "d" -a -d "$TO/$DIR" ]; then 
+      IS_VERSION="YES"
+    fi
+  fi
 fi
 if [ "$IS_VERSION" = "NO" ]; then
   cd $CURDIR
@@ -59,9 +69,9 @@ cd $TO
 
 # create basic test macro
 if [ "$VIS" = "0" ]; then 
-  cat $AG4_INSTALL/config/test_default_det_novis.in | sed s/NNN/$VER/g | sed s/WWW/$VER/g | sed s/GGG/$GEN/g |  sed s/VVV/$VIS/g | sed s/XXX/$MOD/g > $TO/$MOD"/v"$VER"_test"$GEN""$VIS".in"
+  cat $AG4_INSTALL/config/test_default_det_novis.in | sed s/NNN/$VER_REPLACE/g | sed s/WWW/$VER_REPLACE/g | sed s/GGG/$GEN/g |  sed s/VVV/$VIS/g | sed s/XXX/$MOD/g > $TO/$MOD"/v"$VER"_test"$GEN""$VIS".in"
 else
-  cat $AG4_INSTALL/config/test_default_det_vis.in | sed s/NNN/$VER/g | sed s/WWW/$VER/g | sed s/GGG/$GEN/g |  sed s/VVV/$VIS/g | sed s/XXX/$MOD/g > $TO/$MOD"/v"$VER"_test"$GEN""$VIS".in"
+  cat $AG4_INSTALL/config/test_default_det_vis.in | sed s/NNN/$VER_REPLACE/g | sed s/WWW/$VER_REPLACE/g | sed s/GGG/$GEN/g |  sed s/VVV/$VIS/g | sed s/XXX/$MOD/g > $TO/$MOD"/v"$VER"_test"$GEN""$VIS".in"
 # create visualisation macro (if it does not yet exist)
   if [ ! -f $TO/$MOD/vis_test$VIS".in" ]; then
     cp $AG4_INSTALL/config/test_default_vis$VIS.in $TO/$MOD/vis_test$VIS.in
@@ -73,4 +83,5 @@ if [ ! -f $TO/$MOD/gen_test$GEN".in" ]; then
   cp $AG4_INSTALL/config/test_default_gen$GEN.in $TO/$MOD/gen_test$GEN.in
 fi
 
+echo "test_create_struct.sh $MOD v$VER test$GEN$VIS"
 cd $CURDIR

diff --git a/AliGeant4/config/test_run.sh b/AliGeant4/config/test_run.sh
index 2068f58c6d386440385a21e9a3503525a45f76df..07847a8b5b5617defb631aabf516dd154358697b 100755 (executable)
--- a/AliGeant4/config/test_run.sh
+++ b/AliGeant4/config/test_run.sh
@@ -42,13 +42,17 @@ if [ "$DIR" = "ALL" ]; then
   for DIR in `ls`; do
     if [ -d $DIR ] ; then
       cd $TO/$DIR
-      VER=0
+      VER="d"
       until [ "$VER" = "$MAX" ] ; do
         if [ -f "v"$VER"_test"$GEN""$VIS".in" ] ; then
           echo "test_run_in.sh $DIR v$VER test$GEN$VIS"
           test_run_in.sh $DIR -d $VER -g $GEN -v $VIS
         fi
-        let VER=$VER+1
+        if [ "$VER" = "d" ]; then
+          VER=0
+        else  
+          let VER=$VER+1
+        fi
       done 
       cd $TO
     fi       
@@ -59,13 +63,17 @@ else
   if [ "$DIR" = "STRUCT" ]; then
     cd $TO/$DIR
     for MODULE in `ls`; do
-      VER=0
+      VER="d"
       until [ "$VER" = "$MAX" ] ; do
         if [ -f $MODULE/"v"$VER"_test"$GEN""$VIS".in" ]; then
           echo "test_run_struct.sh $MODULE v$VER test$GEN$VIS"
           test_run_struct.sh $MODULE -d $VER -g $GEN -v $VIS
        fi  
-        let VER=$VER+1
+        if [ "$VER" = "d" ]; then
+          VER=0
+        else  
+          let VER=$VER+1
+        fi
       done
     done
   else