diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a233a956629a1d518bdc4bce2a8c8b5b2488e6b..b5f80e4c4149036b5a1a9d675a3debb919ea8f4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,18 +4,24 @@ variables:
GIT_SSL_NO_VERIFY: "1"
GIT_SUBMODULE_STRATEGY: normal
-#cache:
-# key: data4cxroot
-# paths:
-# - tabs/
-# policy: pull-push
+
+##########################################################
+# cache keeps the unpacked data files
+# CLEAR CACHE via gitlab if data files are updates!
+cache:
+ key: data4cxroot
+ paths:
+ - tabs/
+ untracked: true
+ policy: pull-push
+
##########################################################
# job/stage to just prepare cmake
check:
image: rootproject/root-ubuntu16
before_script:
- - find . -name "*.bz2" | grep -v ".git" | xargs -n 1 bunzip2 -kf
+ - for F in `find . -name "*.bz2" | grep -v ".git"`; do [ ! -f ${F%%.bz2} ] && bunzip2 -vk $F; done
tags:
- corsika
script:
diff --git a/Makefile b/Makefile
index f6bed147177b713d888fe21e638bff31f4e222d0..efab43989f2016c6efb1140220df5dccc020a164 100644
--- a/Makefile
+++ b/Makefile
@@ -107,6 +107,7 @@ CFLAGS += $(OPTIMZE) $(DEBUG)
CXXFLAGS += $(OPTIMZE) $(DEBUG)
OBJS := $(OBJDIR)/conex_f.o $(OBJDIR)/preshw.o $(OBJDIR)/utils.o $(OBJDIR)/veto.o $(OBJDIR)/leadingInteractionsData.o
+
ifdef CONEX_EXTENSIONS
ifndef CX_NO_ROOT
OBJS += $(OBJDIR)/particle.o $(OBJDIR)/particleDict.o
@@ -128,10 +129,12 @@ ifeq ("$(SYSTEM)", "Darwin")
endif
BZ2=""
+INTERFACE_SOURCE := $(CORSIKA_DATA)/readLib/source/Interface.dummy.cc
+OBJS += $(OBJDIR)/Interface.o
ifdef CORSIKA_DATA
ifndef NO_BOOST
BZ2=".bz2"
- OBJS += $(OBJDIR)/Interface.o
+ INTERFACE_SOURCE := $(CORSIKA_DATA)/readLib/source/Interface.boost.cc
endif
endif
@@ -176,9 +179,9 @@ crossSection:
$(MAKE) -f Makefile.crossSection
commons: dirs param_files config_auto
-param_files: $(PARAMS)
+param_files: dirs $(PARAMS)
-config_auto:
+config_auto: dirs
@echo "#ifndef _include_conexconfigauto_h__" > src/conexConfigAuto.h
@echo "#define _include_conexconfigauto_h__" >> src/conexConfigAuto.h
ifdef CONEX_EXTENSIONS
@@ -199,36 +202,36 @@ $(CFGDIR)/%.param: src/%.paramin
@cat $^ | sed s%@BZ2@%$(BZ2)%g | sed s%@CONEXTABROOT@%$(TABDIR)%g > $@ ;
-$(OBJDIR)/ConexDynamicInterface.o: src/ConexDynamicInterface.cc src/ConexDynamicInterface.h src/conexConfig.h
+$(OBJDIR)/ConexDynamicInterface.o: dirs src/ConexDynamicInterface.cc src/ConexDynamicInterface.h src/conexConfig.h
$(CXX) $(CXXFLAGS) $(ROOTCXXFLAGS) -D_CONEX_PREFIX=\"$(CONEX_PREFIX)\" -D_CONEX_SYSTEM=\"$(SYSTEM)\" src/ConexDynamicInterface.cc -c -o $@
# the optional compressed data reading
-$(OBJDIR)/Interface.o: $(CORSIKA_DATA)/readLib/source/Interface.boost.cc
+$(OBJDIR)/Interface.o: $(INTERFACE_SOURCE)
$(CXX) -I$(CORSIKA_DATA)/readLib $(CXXFLAGS) $^ -c -o $@
-$(OBJDIR)/CxRoot.o: src/CxRoot.cc src/CxRoot.h src/conexConfig.h src/leadingInteractionsData.cc src/leadingInteractionsData.h
+$(OBJDIR)/CxRoot.o: dirs src/CxRoot.cc src/CxRoot.h src/conexConfig.h src/leadingInteractionsData.cc src/leadingInteractionsData.h
$(CXX) $(CXXFLAGS) $(ROOTCXXFLAGS) -D_CONEX_PREFIX=\"$(CONEX_PREFIX)\" -D_CONEX_SYSTEM=\"$(SYSTEM)\" src/CxRoot.cc -c -o $@
-$(BINDIR)/conex2r: src/conex.cc $(OBJDIR)/ConexDynamicInterface.o $(OBJDIR)/CxRoot.o $(OBJDIR)/leadingInteractionsData.o $(OBJDIR)/trapfpe.o src/conexConfig.h
+$(BINDIR)/conex2r: src/conex.cc dirs $(OBJDIR)/ConexDynamicInterface.o $(OBJDIR)/CxRoot.o $(OBJDIR)/leadingInteractionsData.o $(OBJDIR)/trapfpe.o src/conexConfig.h
@(echo "==[make]==> compiling CONEX-ROOT interface")
$(CXX) $(CXXFLAGS) $(ROOTCXXFLAGS) $(ROOTLDFLAGS) $(LDFLAGS) -D_CONEX_PREFIX=\"$(CONEX_PREFIX)\" -D_CONEX_SYSTEM=\"$(SYSTEM)\" $(OBJDIR)/ConexDynamicInterface.o $(OBJDIR)/CxRoot.o $(OBJDIR)/leadingInteractionsData.o -l$(G2C) src/conex.cc -o $@
-$(OBJDIR)/conex_f.o: src/conex2r.F src/conexConfig.h
+$(OBJDIR)/conex_f.o: dirs src/conex2r.F src/conexConfig.h
$(FC) $(CPPFLAGS) $(FFLAGS) -c src/conex2r.F -o $(OBJDIR)/conex_f.o
-$(OBJDIR)/Modifier.o: src/Modifier.h src/Modifier.cc src/conexConfig.h
+$(OBJDIR)/Modifier.o: dirs src/Modifier.h src/Modifier.cc src/conexConfig.h
$(CXX) $(CXXFLAGS) $(ROOTCXXFLAGS) -c src/Modifier.cc -o $(OBJDIR)/Modifier.o
-$(OBJDIR)/leadingInteractionsData.o: src/leadingInteractionsData.h src/leadingInteractionsData.cc src/conexConfig.h
+$(OBJDIR)/leadingInteractionsData.o: dirs src/leadingInteractionsData.h src/leadingInteractionsData.cc src/conexConfig.h
$(CXX) $(CXXFLAGS) $(ROOTCXXFLAGS) -c src/leadingInteractionsData.cc -o $(OBJDIR)/leadingInteractionsData.o
-$(OBJDIR)/conexExtensions.o: src/conexExtensions.h src/conexExtensions.cc src/conexConfig.h
+$(OBJDIR)/conexExtensions.o: dirs src/conexExtensions.h src/conexExtensions.cc src/conexConfig.h
$(CXX) $(CXXFLAGS) $(ROOTCXXFLAGS) -c src/conexExtensions.cc -o $(OBJDIR)/conexExtensions.o
-$(OBJDIR)/conexExtensionsF.o: src/conexExtensionsF.h src/conexExtensionsF.cc src/conexConfig.h
+$(OBJDIR)/conexExtensionsF.o: dirs src/conexExtensionsF.h src/conexExtensionsF.cc src/conexConfig.h
$(CXX) $(CXXFLAGS) $(ROOTCXXFLAGS) -c src/conexExtensionsF.cc -o $(OBJDIR)/conexExtensionsF.o
-$(OBJDIR)/conexResampling.o: src/conexResampling.h src/conexResampling.cc src/conexConfig.h
+$(OBJDIR)/conexResampling.o: dirs src/conexResampling.h src/conexResampling.cc src/conexConfig.h
$(CXX) $(CXXFLAGS) $(ROOTCXXFLAGS) -c src/conexResampling.cc -o $(OBJDIR)/conexResampling.o
$(OBJDIR)/particleDict.cc: src/particle.h src/particleLinkDef.h
@@ -252,35 +255,35 @@ $(OBJDIR)/veto.o: src/veto.c
$(OBJDIR)/trapfpe.o: $(TRAPFPE)
$(CC) $(CCFLAGS) -D_GNU_SOURCE -c $^ -o $@
-$(OBJDIR)/conex_sub_sibyll.o: src/conex_sub.F src/conexConfig.h
+$(OBJDIR)/conex_sub_sibyll.o: dirs src/conex_sub.F src/conexConfig.h
@(echo "==[make]==> compiling main CONEX routines for SIBYLL (this may take a while ...)")
$(FC) $(FFLAGS) $(CPPFLAGS) -D__SIBYLL21__ -c src/conex_sub.F -o $@
-$(OBJDIR)/conex_sub_epos.o: src/conex_sub.F src/conexConfig.h
+$(OBJDIR)/conex_sub_epos.o: dirs src/conex_sub.F src/conexConfig.h
@(echo "==[make]==> compiling main CONEX routines for EPOS (this may take a while ...)")
$(FC) $(FFLAGS) $(CPPFLAGS) -D__EPOS__ -c src/conex_sub.F -o $@
-$(OBJDIR)/conex_sub_qgsjetII.o: src/conex_sub.F src/conexConfig.h
+$(OBJDIR)/conex_sub_qgsjetII.o: dirs src/conex_sub.F src/conexConfig.h
@(echo "==[make]==> compiling main CONEX routines for QGSJETII (this may take a while ...)")
$(FC) $(FFLAGS) $(CPPFLAGS) -D__QGSJETII__ -c src/conex_sub.F -o $@
-$(OBJDIR)/conex_sub_dpmjetIII.o: src/conex_sub.F src/conexConfig.h
+$(OBJDIR)/conex_sub_dpmjetIII.o: dirs src/conex_sub.F src/conexConfig.h
@(echo "==[make]==> compiling main CONEX routines for DPMJETIII (this may take a while ...)")
$(FC) $(FFLAGS) $(CPPFLAGS) -D__DPMJET__ -c src/conex_sub.F -o $@
-$(OBJDIR)/conex_sub_qgsjet.o: src/conex_sub.F src/conexConfig.h
+$(OBJDIR)/conex_sub_qgsjet.o: dirs src/conex_sub.F src/conexConfig.h
@(echo "==[make]==> compiling main CONEX routines for QGSJET01 (this may take a while ...)")
$(FC) $(FFLAGS) $(CPPFLAGS) -D__QGSJET__ -c src/conex_sub.F -o $@
-$(OBJDIR)/conex_mod_sibyll.o: src/conex_mod.F src/conexConfig.h
+$(OBJDIR)/conex_mod_sibyll.o: dirs src/conex_mod.F src/conexConfig.h
@(echo "==[make]==> compiling main CONEX routines for SIBYLL (this may take a while ...)")
$(FC) $(FFLAGS) $(CPPFLAGS) -D__SIBYLL21__ -c src/conex_mod.F -o $@
-$(OBJDIR)/conex_mod_epos.o: src/conex_mod.F src/conexConfig.h
+$(OBJDIR)/conex_mod_epos.o: dirs src/conex_mod.F src/conexConfig.h
@(echo "==[make]==> compiling main CONEX routines for EPOS (this may take a while ...)")
$(FC) $(FFLAGS) $(CPPFLAGS) -D__EPOS__ -c src/conex_mod.F -o $@
-$(OBJDIR)/conex_mod_qgsjetII.o: src/conex_mod.F src/conexConfig.h
+$(OBJDIR)/conex_mod_qgsjetII.o: dirs src/conex_mod.F src/conexConfig.h
@(echo "==[make]==> compiling main CONEX routines for QGSJETII (this may take a while ...)")
$(FC) $(FFLAGS) $(CPPFLAGS) -D__QGSJETII__ -c src/conex_mod.F -o $@
-$(OBJDIR)/conex_mod_dpmjetIII.o: src/conex_mod.F src/conexConfig.h
+$(OBJDIR)/conex_mod_dpmjetIII.o: dirs src/conex_mod.F src/conexConfig.h
@(echo "==[make]==> compiling main CONEX routines for DPMJETIII (this may take a while ...)")
$(FC) $(FFLAGS) $(CPPFLAGS) -D__DPMJET__ -c src/conex_mod.F -o $@
-$(OBJDIR)/conex_mod_qgsjet.o: src/conex_mod.F src/conexConfig.h
+$(OBJDIR)/conex_mod_qgsjet.o: dirs src/conex_mod.F src/conexConfig.h
@(echo "==[make]==> compiling main CONEX routines for QGSJET01 (this may take a while ...)")
$(FC) $(FFLAGS) $(CPPFLAGS) -D__QGSJET__ -c src/conex_mod.F -o $@
@@ -288,7 +291,7 @@ $(LIBDIR)/libCONEXdynamic.a: $(OBJDIR)/ConexDynamicInterface.o
@(echo "==[make]==> compiling particle resampling routines ...")
$(AR) r $@ $^
-$(LIBDIR)/libresample.a: $(LIBRESAMPLE_SOURCES)
+$(LIBDIR)/libresample.a: dirs $(LIBRESAMPLE_SOURCES)
@(echo "==[make]==> compiling particle resampling routines ...")
$(MAKE) -C resampler
ln -fs ../../resampler/libresample.a $@
diff --git a/src/conex_dpmjet.paramin b/src/conex_dpmjet.paramin
index 63fc276f9079c48cde76081fff07e4189e680e7b..4ea66157f678848ac003b61424273bf60855afe7 100644
--- a/src/conex_dpmjet.paramin
+++ b/src/conex_dpmjet.paramin
@@ -1,18 +1,18 @@
model dpmjet
lemodel urqmd
!------------------------------
-fconex wle @CONEXTABROOT@CONEX/conex.wurq20.bz2 ! urqmd
-fconex whe @CONEXTABROOT@CONEX/conex.wdpm20.bz2 ! dpmjet
-fconex p2d @CONEXTABROOT@CONEX/conex.p2dec20.bz2 ! decays
-fconex p2le @CONEXTABROOT@CONEX/conex.p2urq20.bz2 ! urqmd
-fconex p2he @CONEXTABROOT@CONEX/conex.p2dpm20.bz2 ! dpmjet
-fconex dkz @CONEXTABROOT@CONEX/conex.dkz20.bz2 ! decays
-fconex dkl @CONEXTABROOT@CONEX/conex.dkl20.bz2
-fconex dks @CONEXTABROOT@CONEX/conex.dks20.bz2
-fconex dkm @CONEXTABROOT@CONEX/conex.dkm20.bz2
-fconex dke @CONEXTABROOT@CONEX/conex.dke20.bz2
-fconex dkn @CONEXTABROOT@CONEX/conex.dkn20.bz2
-fconex dkg @CONEXTABROOT@CONEX/conex.dkg20.bz2
+fconex wle @CONEXTABROOT@CONEX/conex.wurq20@BZ2@ ! urqmd
+fconex whe @CONEXTABROOT@CONEX/conex.wdpm20@BZ2@ ! dpmjet
+fconex p2d @CONEXTABROOT@CONEX/conex.p2dec20@BZ2@ ! decays
+fconex p2le @CONEXTABROOT@CONEX/conex.p2urq20@BZ2@ ! urqmd
+fconex p2he @CONEXTABROOT@CONEX/conex.p2dpm20@BZ2@ ! dpmjet
+fconex dkz @CONEXTABROOT@CONEX/conex.dkz20@BZ2@ ! decays
+fconex dkl @CONEXTABROOT@CONEX/conex.dkl20@BZ2@
+fconex dks @CONEXTABROOT@CONEX/conex.dks20@BZ2@
+fconex dkm @CONEXTABROOT@CONEX/conex.dkm20@BZ2@
+fconex dke @CONEXTABROOT@CONEX/conex.dke20@BZ2@
+fconex dkn @CONEXTABROOT@CONEX/conex.dkn20@BZ2@
+fconex dkg @CONEXTABROOT@CONEX/conex.dkg20@BZ2@
!fopen ! to use output file (check, histo ...)
!------------------------------
fegs dat @CONEXTABROOT@EGS4/egs4.dat
diff --git a/src/conex_epos.paramin b/src/conex_epos.paramin
index f29cff0981ecafcdb94fece73828a77b1abc8671..0c5313509ab2d08e083b328fbdd84233aacf61fc 100644
--- a/src/conex_epos.paramin
+++ b/src/conex_epos.paramin
@@ -1,18 +1,18 @@
model epos
lemodel urqmd
!------------------------------
-fconex wle @CONEXTABROOT@CONEX/conex.wurq20.bz2 ! urqmd
-fconex whe @CONEXTABROOT@CONEX/conex.wepo20.bz2 ! epos
-fconex p2le @CONEXTABROOT@CONEX/conex.p2urq20.bz2 ! urqmd
-fconex p2he @CONEXTABROOT@CONEX/conex.p2epo20.bz2 ! epos
-fconex p2d @CONEXTABROOT@CONEX/conex.p2dec20.bz2 ! decays
-fconex dkz @CONEXTABROOT@CONEX/conex.dkz20.bz2 ! decays
-fconex dkl @CONEXTABROOT@CONEX/conex.dkl20.bz2
-fconex dks @CONEXTABROOT@CONEX/conex.dks20.bz2
-fconex dkm @CONEXTABROOT@CONEX/conex.dkm20.bz2
-fconex dke @CONEXTABROOT@CONEX/conex.dke20.bz2
-fconex dkn @CONEXTABROOT@CONEX/conex.dkn20.bz2
-fconex dkg @CONEXTABROOT@CONEX/conex.dkg20.bz2
+fconex wle @CONEXTABROOT@CONEX/conex.wurq20@BZ2@ ! urqmd
+fconex whe @CONEXTABROOT@CONEX/conex.wepo20@BZ2@ ! epos
+fconex p2le @CONEXTABROOT@CONEX/conex.p2urq20@BZ2@ ! urqmd
+fconex p2he @CONEXTABROOT@CONEX/conex.p2epo20@BZ2@ ! epos
+fconex p2d @CONEXTABROOT@CONEX/conex.p2dec20@BZ2@ ! decays
+fconex dkz @CONEXTABROOT@CONEX/conex.dkz20@BZ2@ ! decays
+fconex dkl @CONEXTABROOT@CONEX/conex.dkl20@BZ2@
+fconex dks @CONEXTABROOT@CONEX/conex.dks20@BZ2@
+fconex dkm @CONEXTABROOT@CONEX/conex.dkm20@BZ2@
+fconex dke @CONEXTABROOT@CONEX/conex.dke20@BZ2@
+fconex dkn @CONEXTABROOT@CONEX/conex.dkn20@BZ2@
+fconex dkg @CONEXTABROOT@CONEX/conex.dkg20@BZ2@
!fopen ! to use output file (check, histo ...)
!------------------------------
fepos check none
diff --git a/src/conex_mod.F b/src/conex_mod.F
index ee2ff0db499fc38bfa46a376a36784787d41b3c4..5a72c2f01ae4339454624545873304be0ddd54b1 100644
--- a/src/conex_mod.F
+++ b/src/conex_mod.F
@@ -31117,10 +31117,10 @@ c fp(i) - pomeron vertex constant (i=icz)
c-----------------------------------------------------------------------------
c reading cross sections from the file
luseCompress=0
- if(ifIIdat.ne.1)then
+ if(ifIIdat.ne.1)then
inquire(file=DATDIR(1:INDEX(DATDIR,' ')-1)//'qgsdat-II-04.bz2'
* ,exist=lcalc)
- if (lcalc) then
+ if (lcalc.and.CorDataCanDeCompress().ne.0) then
luseCompress=1
else
inquire(file=DATDIR(1:INDEX(DATDIR,' ')-1)//'qgsdat-II-04'
@@ -32675,7 +32675,7 @@ c nuclear cross sections
if(ifIIncs.ne.2)then
inquire(file=DATDIR(1:INDEX(DATDIR,' ')-1)//'sectnu-II-04.bz2'
* ,exist=lcalc)
- if (lcalc) then
+ if (lcalc.and.CorDataCanDeCompress().ne.0) then
luseCompress=1
else
inquire(file=DATDIR(1:INDEX(DATDIR,' ')-1)//'sectnu-II-04'
diff --git a/src/conex_qgsjet.paramin b/src/conex_qgsjet.paramin
index ad3aa77605ddd0c129d5903397de7a5daf2e2e79..63de4740edf0a0ce6cb603d2261e6045074da21e 100644
--- a/src/conex_qgsjet.paramin
+++ b/src/conex_qgsjet.paramin
@@ -1,18 +1,18 @@
model qgsjet
lemodel urqmd
!------------------------------
-fconex wle @CONEXTABROOT@CONEX/conex.wurq20.bz2 ! urqmd
-fconex whe @CONEXTABROOT@CONEX/conex.wqgs20.bz2 ! qgsjet
-fconex p2le @CONEXTABROOT@CONEX/conex.p2urq20.bz2 ! urqmd
-fconex p2he @CONEXTABROOT@CONEX/conex.p2qgs20.bz2 ! qgsjet
-fconex p2d @CONEXTABROOT@CONEX/conex.p2dec20.bz2 ! decays
-fconex dkz @CONEXTABROOT@CONEX/conex.dkz20.bz2 ! decays
-fconex dkl @CONEXTABROOT@CONEX/conex.dkl20.bz2
-fconex dks @CONEXTABROOT@CONEX/conex.dks20.bz2
-fconex dkm @CONEXTABROOT@CONEX/conex.dkm20.bz2
-fconex dke @CONEXTABROOT@CONEX/conex.dke20.bz2
-fconex dkn @CONEXTABROOT@CONEX/conex.dkn20.bz2
-fconex dkg @CONEXTABROOT@CONEX/conex.dkg20.bz2
+fconex wle @CONEXTABROOT@CONEX/conex.wurq20@BZ2@ ! urqmd
+fconex whe @CONEXTABROOT@CONEX/conex.wqgs20@BZ2@ ! qgsjet
+fconex p2le @CONEXTABROOT@CONEX/conex.p2urq20@BZ2@ ! urqmd
+fconex p2he @CONEXTABROOT@CONEX/conex.p2qgs20@BZ2@ ! qgsjet
+fconex p2d @CONEXTABROOT@CONEX/conex.p2dec20@BZ2@ ! decays
+fconex dkz @CONEXTABROOT@CONEX/conex.dkz20@BZ2@ ! decays
+fconex dkl @CONEXTABROOT@CONEX/conex.dkl20@BZ2@
+fconex dks @CONEXTABROOT@CONEX/conex.dks20@BZ2@
+fconex dkm @CONEXTABROOT@CONEX/conex.dkm20@BZ2@
+fconex dke @CONEXTABROOT@CONEX/conex.dke20@BZ2@
+fconex dkn @CONEXTABROOT@CONEX/conex.dkn20@BZ2@
+fconex dkg @CONEXTABROOT@CONEX/conex.dkg20@BZ2@
!fopen ! to use output file (check, histo ...)
!------------------------------
fqgsjet dat @CONEXTABROOT@QGSJet/qgsjet.dat
diff --git a/src/conex_qgsjetII.paramin b/src/conex_qgsjetII.paramin
index 438ef5e02fc4bafa8ebe3f6dc3780fbbdacd910b..4dcaa4b57ee3db62476d044e12fa73e42ebed96a 100644
--- a/src/conex_qgsjetII.paramin
+++ b/src/conex_qgsjetII.paramin
@@ -1,22 +1,22 @@
model IIqgsjet
lemodel urqmd
!------------------------------
-fconex wle @CONEXTABROOT@CONEX/conex.wurq20.bz2 ! urqmd
-fconex whe @CONEXTABROOT@CONEX/conex.wIIq20.bz2 ! qgsjetII
-fconex p2le @CONEXTABROOT@CONEX/conex.p2urq20.bz2 ! urqmd
-fconex p2he @CONEXTABROOT@CONEX/conex.p2IIq20.bz2 ! qgsjetII
-fconex p2d @CONEXTABROOT@CONEX/conex.p2dec20.bz2 ! decays
-fconex dkz @CONEXTABROOT@CONEX/conex.dkz20.bz2 ! decays
-fconex dkl @CONEXTABROOT@CONEX/conex.dkl20.bz2
-fconex dks @CONEXTABROOT@CONEX/conex.dks20.bz2
-fconex dkm @CONEXTABROOT@CONEX/conex.dkm20.bz2
-fconex dke @CONEXTABROOT@CONEX/conex.dke20.bz2
-fconex dkn @CONEXTABROOT@CONEX/conex.dkn20.bz2
-fconex dkg @CONEXTABROOT@CONEX/conex.dkg20.bz2
+fconex wle @CONEXTABROOT@CONEX/conex.wurq20@BZ2@ ! urqmd
+fconex whe @CONEXTABROOT@CONEX/conex.wIIq20@BZ2@ ! qgsjetII
+fconex p2le @CONEXTABROOT@CONEX/conex.p2urq20@BZ2@ ! urqmd
+fconex p2he @CONEXTABROOT@CONEX/conex.p2IIq20@BZ2@ ! qgsjetII
+fconex p2d @CONEXTABROOT@CONEX/conex.p2dec20@BZ2@ ! decays
+fconex dkz @CONEXTABROOT@CONEX/conex.dkz20@BZ2@ ! decays
+fconex dkl @CONEXTABROOT@CONEX/conex.dkl20@BZ2@
+fconex dks @CONEXTABROOT@CONEX/conex.dks20@BZ2@
+fconex dkm @CONEXTABROOT@CONEX/conex.dkm20@BZ2@
+fconex dke @CONEXTABROOT@CONEX/conex.dke20@BZ2@
+fconex dkn @CONEXTABROOT@CONEX/conex.dkn20@BZ2@
+fconex dkg @CONEXTABROOT@CONEX/conex.dkg20@BZ2@
!fopen ! to use output file (check, histo ...)
!------------------------------
-fqgsjetII dat @CONEXTABROOT@QGSJetII/qgsdat-II-04.bz2
-fqgsjetII ncs @CONEXTABROOT@QGSJetII/sectnu-II-04.bz2
+fqgsjetII dat @CONEXTABROOT@QGSJetII/qgsdat-II-04@BZ2@
+fqgsjetII ncs @CONEXTABROOT@QGSJetII/sectnu-II-04@BZ2@
!------------------------------
fegs dat @CONEXTABROOT@EGS4/egs4.dat
fegs out @CONEXTABROOT@EGS4/egs4.out
diff --git a/tabs b/tabs
index 26b65a787273feef4208ac7882ad30a86b668ee4..8b0b40b6c5b1e264fdf352bb129ded88ff49e28b 160000
--- a/tabs
+++ b/tabs
@@ -1 +1 @@
-Subproject commit 26b65a787273feef4208ac7882ad30a86b668ee4
+Subproject commit 8b0b40b6c5b1e264fdf352bb129ded88ff49e28b