Introduce routines of GEANE

diff --git a/GEANT321/Makefile b/GEANT321/Makefile
index 8ae61b4664fe4c0eaa7de140137ab4693b8d8b93..6ca0e1f6c07449003b903a720da497ea72562c42 100644 (file)
--- a/GEANT321/Makefile
+++ b/GEANT321/Makefile
@@ -9,7 +9,7 @@ PACKAGE = GEANT321
 
 GDIRS = gbase gcons gdraw geocad ggeom gheisha ghits ghrout ghutils giface \
         giopa gkine gparal gphys gscan gstrag gtrak matx55 miface miguti \
-        neutron peanut fiface cgpack fluka block comad
+        neutron peanut fiface cgpack fluka block comad erdecks erpremc
 
 XDIRS = gxint cdf
 

diff --git a/GEANT321/comad/gcadd.cxx b/GEANT321/comad/gcadd.cxx
index 19ddbab6b9b201767808b6595414d31ecd566d3c..d7025bd86d1063f6c2d77dac5670ac838ede4940 100644 (file)
--- a/GEANT321/comad/gcadd.cxx
+++ b/GEANT321/comad/gcadd.cxx
@@ -1,12 +1,14 @@
 #if defined(CERNLIB_WINNT)
   #define gcaddc GCADDC
   #define gcaddf GCADDF
+  #define gcaddd GCADDD
   #define gcaddi GCADDI
   #define gcaddl GCADDL
   #define type_of_call _stdcall
 #else
   #define gcaddc gcaddc_
   #define gcaddf gcaddf_
+  #define gcaddd gcaddd_
   #define gcaddi gcaddi_
   #define gcaddl gcaddl_
   #define type_of_call
@@ -16,6 +18,10 @@ extern "C" char* type_of_call gcaddc(char *arg)
 {
   return arg;
 }
+extern "C" double* type_of_call gcaddd(double *arg)
+{
+  return arg;
+}
 extern "C" int*  type_of_call gcaddi(int  *arg)
 {
   return arg;

diff --git a/GEANT321/comad/gcomad.F b/GEANT321/comad/gcomad.F
index 45f597579ac46a824d73c4a17f412f88e23a2042..1512f254b7207cf512acb91f5453ea6ca906f5ca 100644 (file)
--- a/GEANT321/comad/gcomad.F
+++ b/GEANT321/comad/gcomad.F
@@ -90,13 +90,20 @@ C
 #include "geant321/gcxlun.inc"
 #include "geant321/gfkdis.inc"
 #include "geant321/gsecti.inc"
+*
+* Commons for GEANE
+#include "geant321/ertrio.inc"
+#include "geant321/eropts.inc"
+#include "geant321/erwork.inc"
+* Commons for GEANE
+*
       COMMON / QUEST / IQUEST(100)
 *
       CHARACTER *(*) CHCOMM
 #if defined(CERNLIB_DECS)
-      INTEGER*8 GCADDI, GCADDF, GCADDL, GCADDC, IADD
+      INTEGER*8 GCADDI, GCADDF, GCADDL, GCADDC, GCADDD, IADD
 #else          
-      INTEGER GCADDI, GCADDF, GCADDL, GCADDC
+      INTEGER GCADDI, GCADDF, GCADDL, GCADDC, GCADDD
 #endif
 *
       IF(CHCOMM.EQ.'GCASHO') THEN
@@ -239,6 +246,14 @@ C
          IADD=GCADDF(THRIND)
       ELSE IF(CHCOMM.EQ.'QUEST') THEN
          IADD=GCADDI(IQUEST)
+      ELSE IF(CHCOMM.EQ.'ERTRIO') THEN
+         IADD=GCADDD(ERDTRP)
+      ELSE IF(CHCOMM.EQ.'EROPTS') THEN
+         IADD=GCADDF(ERPLI)
+      ELSE IF(CHCOMM.EQ.'EROPTC') THEN
+         IADD=GCADDC(CHOPTI)
+      ELSE IF(CHCOMM.EQ.'ERWORK') THEN
+         IADD=GCADDD(EI)
       ELSE IF(CHCOMM.EQ.'GCBANK') THEN
          IADD=GCADDI(NZEBRA)
       ELSE