diff --git a/CMakeLists.txt b/CMakeLists.txt index bb37aca2037380f9843f14bccc01c4ba6647e835..aa6765f36599378a3dc99482a28814d0fcfb83de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,8 @@ ################################################################################ cmake_minimum_required (VERSION 3.5) project (simc) -set (SIMC_MAJOR_VERSION 1) -set (SIMC_MINOR_VERSION 0) +set (SIMC_MAJOR_VERSION 0) +set (SIMC_MINOR_VERSION 1) set (SIMC_PATCH_VERSION 0) set (SIMC_VERSION ${SIMC_MAJOR_VERSION}.${SIMC_MINOR_VERSION}.${SIMC_PATCH_VERSION}) diff --git a/simc/event.f b/simc/event.f index 21ff5dce580d826a0448b114479e027d7cfbe90f..38e78e153f98a52ee94660da240035d6b82bbf6c 100644 --- a/simc/event.f +++ b/simc/event.f @@ -308,6 +308,11 @@ C modified 5/15/06 for poinct vertex%p%delta = 100.*(vertex%p%P-spec%p%P)/spec%p%P vertex%e%E = sqrt(vertex%e%P*vertex%e%P + 0.511*0.511) vertex%p%E = sqrt(vertex%p%P*vertex%p%P + 0.511*0.511) + if(debug(5)) then + write(*,*) ' E and Delta: ' + write(*,*) ' HMS: ',vertex%e%E,vertex%e%delta + write(*,*) ' SHMS: ',vertex%p%E,vertex%p%delta + endif !debug endif ! Calculate the electron and proton PHYSICS angles from the spectrometer angles. @@ -318,6 +323,11 @@ C modified 5/15/06 for poinct & vertex%e%xptar,vertex%e%yptar,vertex%e%theta,vertex%e%phi) call physics_angles(spec%p%theta,spec%p%phi, & vertex%p%xptar,vertex%p%yptar,vertex%p%theta,vertex%p%phi) + if(debug(5)) then + write(*,*) ' PHYSICS ANGLES: ' + write(*,*) ' HMS(deg): ',vertex%e%theta/pi*180,vertex%e%phi/pi*180 + write(*,*) ' SHMS(deg): ',vertex%p%theta/pi*180,vertex%p%phi/pi*180 + endif !debug ! Generate Fermi Momentum and Em for A(e,e'pi) and A(e,e'K). pfer=0.0 diff --git a/simc/get_file_event.f b/simc/get_file_event.f index 974ec3c9af00006507123cca9e188e3e7066df66..ac7c4d9f5f0874b56160e779ca0f201b04a11681 100644 --- a/simc/get_file_event.f +++ b/simc/get_file_event.f @@ -13,6 +13,7 @@ c dydzp : yptar for proton c p_mom : proton momentum ( MeV) c implicit none + include 'simulate.inc' c real*8 e_mom real*8 p_mom @@ -43,13 +44,21 @@ c read(51,*,end=999,err=999) dxdz,dydz,e_mom,dxdzp,dydzp,p_mom,w count = count + 1 c - p_mom = p_mom *1. - e_mom = e_mom *1. - dxdz = dxdz/1000. - dydz = dydz/1000. - dxdzp = dxdzp/1000. - dydzp = dydzp/1000. + p_mom = p_mom*1000. + e_mom = e_mom*1000. + dxdz = dxdz/1. + dydz = dydz/1. + + dxdzp = dxdzp/1. + dydzp = dydzp/1. weight = w + + if(debug(5)) then + write(*,*) ' ' + write(*,*) ' NEW EVENT: ',count + write(*,*) ' HMS: ',dxdz,dydz,e_mom + write(*,*) ' SHMS: ',dxdzp,dydzp,p_mom + endif !debug c return c