IAP GITLAB

Commit eef076eb authored by Tanguy Pierog's avatar Tanguy Pierog

add QGSJET-II-04 but cmake doesn't work <-- to be fixed


git-svn-id: https://devel-ik.fzk.de/svn/mc/crmc/trunk@3158 c7a5e08c-de06-0410-9364-b41cf42a0b17
parent 7cba2744
......@@ -5,15 +5,16 @@ PROJECT (crmc)
SET (CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR})
# Enable/Disable models to be built
OPTION (__QGSJET01__ "Build with model" ON)
OPTION (__QGSJET01__ "Build with model" OFF)
OPTION (__GHEISHA__ "Build with model" OFF)
OPTION (__PYTHIA__ "Build with model" OFF)
OPTION (__HIJING__ "Build with model" OFF)
OPTION (__SIBYLL__ "Build with model" ON)
OPTION (__SIBYLL__ "Build with model" OFF)
OPTION (__PHOJET__ "Build with model" OFF)
OPTION (__PYTHIA__ "Build with model" OFF)
OPTION (__QGSJETII__ "Build with model" ON)
# TODO want to disable epos, too
OPTION (__QGSJETII__ "Build with model" OFF)
OPTION (__QGSJETII04__ "Build with model" ON)
# TODO want to disable epos, too <-- from TP : not completely possible without rewritting a lot (it is done in CONEX)
# TODO better support for model versions
######################################ONLY EDIT THIS######################################
......
......@@ -38,9 +38,7 @@ ROOTLIBS = $(shell root-config --libs)
###############MAKE OPTIONS###############
__QGSJET01__=1
__SIBYLL__=1
__QGSJETII__=1
QIITAB="03"
ifdef __QGSJET01__
FFLAGS += -D __QGSJET01__
CFLAGS += -D __QGSJET01__
......@@ -71,6 +69,12 @@ FFLAGS += -D __QGSJETII__
CFLAGS += -D __QGSJETII__
CXXFLAGS += -D __QGSJETII__
endif
ifdef __QGSJETII04__
QIITAB ="04"
FFLAGS += -D __QGSJETII__
CFLAGS += -D __QGSJETII__
CXXFLAGS += -D __QGSJETII__
endif
ifdef __PHOJET__
FFLAGS += -D __PHOJET__
CFLAGS += -D __PHOJET__
......@@ -121,6 +125,11 @@ FILES+=\
qgsjetII/qgsjet-II-03.f \
qgsjetII/qgsjetII_epos.f
endif
ifdef __QGSJETII04__
FILES+=\
qgsjetII-04/qgsjet-II-04.f \
qgsjetII-04/qgsjetII_epos.f
endif
ifdef __PHOJET__
FILES+=\
phojet/phojet.f \
......@@ -175,6 +184,9 @@ endif
ifdef __QGSJETII__
@(echo -n ", QGSJETII")
endif
ifdef __QGSJETII04__
@(echo -n ", QGSJETII04")
endif
ifdef __PHOJET__
@(echo -n ", PHOJET")
endif
......@@ -197,6 +209,9 @@ $(CXXOBJS) : $(LIBDIR)%.o : $(SOURCE_DIR)%.cc
@if [ ! -e $@ ] ; then \
cat $^ | sed s%@CRMCROOT@%$(CRMCROOT)%g > $@ ; \
fi
@if [ ! -e $@ ] ; then \
cat $^ | sed s%@QIITAB@%$(QIITAB)%g > $@ ; \
fi
tar: $(SOURCE_DIR) $(PARAM_DIR) Makefile
tar czvf crmc$(VER).tgz $^
......@@ -214,6 +229,9 @@ dirs:
@if [ ! -d $(LIBDIR)qgsjetII ] ;then \
set -x; mkdir -p $(LIBDIR)qgsjetII; set +x; \
fi
@if [ ! -d $(LIBDIR)qgsjetII-04 ] ;then \
set -x; mkdir -p $(LIBDIR)qgsjetII-04; set +x; \
fi
@if [ ! -d $(LIBDIR)gheisha ] ;then \
set -x; mkdir -p $(LIBDIR)gheisha; set +x; \
fi
......
......@@ -33,11 +33,6 @@ CRMCoptions::CRMCoptions(int argc, char** argv)
if ( fTest ) {
fNCollision=500;
fSeed=123;
fProjectileId=1;
fTargetId=1;
fHEModel=0;
fProjectileMomentum=3500;
fTargetMomentum=-3500;
}
}
......
......@@ -25,8 +25,8 @@ MinDecayLength 1. !minimum c.Tau to define stable particles (cm)
fqgsjet dat @CRMCROOT@/tabs/qgsjet.dat
fqgsjet ncs @CRMCROOT@/tabs/qgsjet.ncs
fqgsjetII dat @CRMCROOT@/tabs/qgsdat-II-03
fqgsjetII ncs @CRMCROOT@/tabs/sectnu-II-03
fqgsjetII dat @CRMCROOT@/tabs/qgsdat-II-@QIITAB@
fqgsjetII ncs @CRMCROOT@/tabs/sectnu-II-@QIITAB@
fname check none
fname initl @CRMCROOT@/tabs/epos.initl
fname iniev @CRMCROOT@/tabs/epos.iniev
......
......@@ -53,44 +53,51 @@
if(model.eq.2) then
#ifndef __QGSJET01__
stop'please compile with requested model'
#endif
#else
call IniQGSjet
#endif
endif
if(model.eq.3) then
#ifndef __GHEISHA__
stop'please compile with requested model'
#endif
#else
call IniGheisha
#endif
endif
if(model.eq.4) then
#ifndef __PYTHIA__
stop'please compile with requested model'
#endif
#else
call IniPythia
#endif
endif
if(model.eq.5) then
#ifndef __HIJING__
stop'please compile with requested model'
#endif
#else
call IniHijing
#endif
endif
if(model.eq.6) then
#ifndef __SIBYLL__
stop'please compile with requested model'
#endif
#else
call IniSibyll
#endif
endif
if(model.eq.7) then
#ifndef __QGSJETII__
stop'please compile with requested model'
#endif
#else
call IniQGSJetII
#endif
endif
if(model.eq.8) then
#ifndef __PHOJET__
stop'please compile with requested model'
#endif
#else
call IniPHOJET
#endif
endif
c if(model.eq.9)call IniFluka
end
......@@ -101,50 +108,57 @@ c if(model.eq.9)call IniFluka
if(model.eq.2)then
#ifndef __QGSJET01__
stop'please compile with requested model'
#endif
#else
call IniEvtQGS
#endif
endif
if(model.eq.3)then
#ifndef __GHEISHA__
stop'please compile with requested model'
#endif
#else
call IniEvtGhe
#endif
endif
if(model.eq.4)then
#ifndef __PYTHIA__
stop'please compile with requested model'
#endif
#else
engysave=engy
if(engy.lt.egymin)engy=egymin
call IniEvtPyt
engy=engysave
#endif
endif
if(model.eq.5)then
#ifndef __HIJING__
stop'please compile with requested model'
#endif
#else
engysave=engy
if(engy.lt.egymin)engy=egymin
call IniEvtHij
engy=engysave
#endif
endif
if(model.eq.6)then
#ifndef __SIBYLL__
stop'please compile with requested model'
#endif
#else
call IniEvtSib
#endif
endif
if(model.eq.7)then
#ifndef __QGSJETII__
stop'please compile with requested model'
#endif
#else
call IniEvtQGSII
#endif
endif
if(model.eq.8)then
#ifndef __PHOJET__
stop'please compile with requested model'
#endif
#else
call IniEvtPho
#endif
endif
c if(model.eq.9)call IniEvtFlu
end
......@@ -153,46 +167,53 @@ c if(model.eq.9)call IniEvtFlu
if(model.eq.2) then
#ifndef __QGSJET01__
stop'please compile with requested model'
#endif
#else
if(id.eq.0)call IniEvtQGS
call emsqgs(iret)
#endif
endif
if(model.eq.3) then
#ifndef __GHEISHA__
stop'please compile with requested model'
#endif
#else
call emsghe(iret)
#endif
endif
if(model.eq.4) then
#ifndef __PYTHIA__
stop'please compile with requested model'
#endif
#else
call emspyt(iret,0)
#endif
endif
if(model.eq.5) then
#ifndef __HIJING__
stop'please compile with requested model'
#endif
#else
call emshij(iret)
#endif
endif
if(model.eq.6) then
#ifndef __SIBYLL__
stop'please compile with requested model'
#endif
#else
call emssib(iret)
#endif
endif
if(model.eq.7) then
#ifndef __QGSJETII__
stop'please compile with requested model'
#endif
#else
if(id.eq.0)call IniEvtQGSII
call emsqgsII(iret)
#endif
endif
if(model.eq.8) then
#ifndef __PHOJET__
stop'please compile with requested model'
#endif
#else
call emspho(iret)
#endif
endif
c if(model.eq.9)call emsflu(iret)
end
......@@ -229,7 +250,7 @@ c if(model.eq.9)call emsflu(iret)
if(model.eq.2)then
#ifndef __QGSJET01__
stop'please compile with requested model'
#endif
#else
NITER=5000
if(idtarg.eq.0)then
e0=dble(elab)
......@@ -241,24 +262,27 @@ c if(model.eq.9)call emsflu(iret)
sigi=sngl(GPROD)
sigc=sngl(GABS)
sige=sigt-sigi
#endif
elseif(model.eq.3)then
#ifndef __GHEISHA__
stop'please compile with requested model'
#endif
#else
idtar=idtarg
if(idtarg.eq.0)idtar=1120
call ghecrse(ekin,idproj,idtar,latarg,matarg,sigi,sige)
sigt=sigi+sige
sigc=sigi
#endif
elseif(model.eq.5)then
#ifndef __HIJING__
stop'please compile with requested model'
#endif
#else
call hjcrossc(sigi,sigt)
#endif
elseif(model.eq.6.and.maproj.eq.1)then
#ifndef __SIBYLL__
stop'please compile with requested model'
#endif
#else
K=1
if(iclpro.eq.1)then
K=2
......@@ -269,10 +293,11 @@ c if(model.eq.9)call emsflu(iret)
CALL GLAUBER(matarg,SSIG,SLOPE,RHO,sigt,sige,sigqel)
sigi=sigt-sigqel
sigc=sigi
#endif
elseif(model.eq.7)then
#ifndef __QGSJETII__
stop'please compile with requested model'
#endif
#else
NITER=5000
if(idtarg.eq.0)then
e0=dble(elab)
......@@ -289,6 +314,7 @@ c sigt=0.
c sige=0.
c sigc=0.
c sigi=flucrse(ekin,maproj,matarg,idtarg)
#endif
else
sigt=0.
sigi=0.
......@@ -302,22 +328,24 @@ c sigi=flucrse(ekin,maproj,matarg,idtarg)
double precision a,b
#ifndef __QGSJET01__
stop'please compile with requested model'
#endif
#else
CALL XXFZ(a,b)
#endif
end
subroutine m3SIGMA(ek,idpro,idtar,latar,matar,sigi,sige)
#ifndef __GHEISHA__
stop'please compile with requested model'
#endif
#else
call ghecrse(ek,idpro,idtar,latar,matar,sigi,sige)
#endif
end
subroutine m6SIGMA(icl,engy,stot,sela,sine,sdifr,slela,Rho)
dimension sdifr0(3)
#ifndef __SIBYLL__
stop'please compile with requested model'
#endif
#else
if(icl.eq.1)then
L=2
elseif(icl.eq.2)then
......@@ -327,6 +355,7 @@ c sigi=flucrse(ekin,maproj,matarg,idtarg)
endif
call SIB_SIGMA_HP(L,engy,stot,sela,sine,sdifr0,slela,Rho)
sdifr=sdifr0(1)+sdifr0(2)+sdifr0(3)
#endif
end
......@@ -336,7 +365,7 @@ c sigi=flucrse(ekin,maproj,matarg,idtarg)
common /qgarr6/ pi,bm,amws
#ifndef __QGSJETII__
stop'please compile with requested model'
#endif
#else
ia2save=ia(2)
bmsave=bm
ia(2)=1
......@@ -347,6 +376,7 @@ c sigi=flucrse(ekin,maproj,matarg,idtarg)
slela=sngl(gzz0(5))
ia(2)=ia2save
bm=bmsave
#endif
end
subroutine m8SIGMA(stot,scut,sine,sela,slela,ssd)
......@@ -365,7 +395,7 @@ C cross sections
& IPFIL,IFAFIL,IFBFIL
#ifndef __PHOJET__
stop'please compile with requested model'
#endif
#else
stot=sngl(SIGTOT)
sine=sngl(SIGTOT-SIGELA)
sela=sngl(SIGELA)
......@@ -373,6 +403,7 @@ C cross sections
ssd=sngl(SIGLSD(1)+SIGHSD(1)+SIGLSD(2)+SIGHSD(2))
sdd=sngl(SIGLDD+SIGHDD)
scut=sine-ssd-sdd-sngl(SIGCDF(0))
#endif
end
subroutine m9SIGMA(stot,sine,sela)
......@@ -403,7 +434,8 @@ c sela=sngl(Sel)
if(model.eq.4)then
#ifndef __PYTHIA__
stop'please compile with requested model'
#endif
#else
call emspyt(iret,ip)
#endif
endif
end
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
3.76472058 3.98705838 4.15302669 4.28651994 4.44890078 4.67853228
4.80423015 4.99004693 5.13507383 5.26484576 4.3485136 4.50958336
4.65853136 4.78456006 4.91022394 5.04404118 5.19894904 5.32465778
5.44308243 5.54406614 4.90595896 5.07330483 5.18702039 5.3038314
5.40691818 5.53132082 5.64118535 5.75348854 5.85875156 5.94779617
5.46334893 5.60238018 5.69564292 5.8041476 5.8894678 5.99285382
6.09732768 6.18218943 6.2627769 6.34484457 5.99764225 6.10566271
6.20021598 6.27576875 6.35061174 6.43623943 6.51888037 6.6002415
6.67118051 6.7270066 6.50062542 6.59579974 6.69032527 6.7408832
6.81089152 6.88153421 6.95069497 7.01002281 7.07316564 7.1171143
4.99355818 5.19343191 5.34380589 5.44983465 5.56404145 5.69244148
5.80684623 5.92741804 6.06592037 6.15351617 5.43107735 5.55603622
5.65741852 5.74070322 5.82832958 5.91953466 6.01753353 6.10532736
6.18292714 6.24561707 5.8773887 5.98207367 6.06589241 6.14597628
6.21845281 6.29191408 6.36756842 6.4280267 6.51066842 6.56373202
6.2998038 6.38317308 6.45584094 6.515671 6.56894442 6.6337254
6.69683141 6.75831744 6.81489389 6.87435129 6.69767724 6.76993611
6.83284121 6.88313545 6.92898203 6.98922324 7.03629743 7.08321227
7.13884037 7.18411401 7.10420039 7.16496656 7.20647135 7.24903803
7.29360726 7.3383187 7.38121118 7.42592311 7.47180882 7.50522968
6.10275159 6.23924465 6.33459698 6.42248901 6.48781508 6.58818708
6.66195959 6.74874376 6.81544238 6.90059789 6.30628064 6.38528186
6.45672465 6.51555335 6.5757627 6.62377065 6.71354777 6.76616327
6.82286377 6.87749908 6.63854477 6.70200465 6.75833344 6.80948112
6.85843595 6.90700696 6.97277499 7.02053846 7.06885983 7.11269568
6.93769536 7.0025226 7.04312374 7.09642699 7.12692106 7.16958676
7.22283141 7.26790081 7.31287428 7.35252845 7.247496 7.2979352
7.34211537 7.38648758 7.42660013 7.45436893 7.49843388 7.53948373
7.58105053 7.62099492 7.56749386 7.60344093 7.64700017 7.67231607
7.70792804 7.73986207 7.78242589 7.8079095 7.84167719 7.87730334
7.06240473 7.153231 7.21852058 7.25861562 7.32972458 7.3705562
7.42545076 7.47961307 7.52514416 7.57162739 7.11428077 7.16765671
7.21847587 7.25165412 7.30148147 7.34430404 7.38018787 7.42062916
7.46698495 7.51420308 7.34399114 7.39111801 7.43349602 7.46842176
7.50198037 7.54535976 7.57789462 7.62387849 7.65092271 7.69017888
7.57397648 7.60781942 7.63856879 7.67366147 7.70767906 7.7411287
7.76888168 7.81009258 7.85123779 7.87469476 7.81060292 7.8484429
7.86834827 7.90686053 7.93197412 7.95349227 7.99037467 8.02476928
8.05034206 8.08534671 8.04958608 8.08580946 8.10714178 8.13832527
8.15876167 8.19260574 8.21466871 8.24214474 8.27307227 8.29747849
5.99070525 6.1272249 6.2178866 6.29137042 6.38982096 6.46600515
6.55694097 6.64199967 6.72048586 6.80000969 6.18858779 6.27481493
6.3609646 6.41092038 6.47564841 6.53537952 6.60935157 6.66967427
6.72034846 6.78813925 6.53958243 6.60696626 6.65569784 6.71516489
6.7606283 6.82256346 6.87004832 6.93046414 6.97509951 7.02879261
6.85109485 6.91520604 6.96036639 7.00361775 7.04935452 7.09125725
7.14966622 7.19021622 7.24420501 7.27953278 7.17129919 7.22653726
7.25745815 7.3028032 7.35031447 7.37711903 7.43220294 7.46941495
7.50612667 7.54964584 7.49050326 7.54129752 7.57800552 7.60852448
7.64005116 7.67957367 7.71610837 7.73932021 7.78540735 7.81407306
6.77429137 6.85824202 6.92084043 6.99841716 7.04694178 7.12444991
7.19185767 7.25952134 7.30203794 7.34774505 6.8534164 6.91782432
6.96673302 7.02376944 7.05255402 7.11431041 7.16785899 7.21296643
7.26019726 7.3044611 7.10670914 7.16912858 7.21327897 7.25545639
7.29156018 7.33736999 7.3820905 7.42450118 7.46235162 7.49966882
7.36910699 7.40983351 7.44640104 7.48682985 7.52122492 7.562327
7.59875257 7.62829976 7.67079708 7.70917071 7.62586555 7.66417462
7.70102952 7.72710191 7.76584561 7.7938797 7.82741801 7.86744496
7.90081293 7.92015657 7.88921416 7.9270166 7.95458696 7.97846066
8.0089677 8.0404912 8.06979252 8.10659538 8.1242306 8.15089005
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment