From 714b758f50bfe7e360ece2542df939a4aeeaa5c1 Mon Sep 17 00:00:00 2001 From: rulrich <ralf.m.ulrich@kit.edu> Date: Fri, 24 Jul 2020 13:40:08 +0200 Subject: [PATCH] fixed wrong file reading --- src/conex_sub.F | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/conex_sub.F b/src/conex_sub.F index 05684a8..534fc05 100644 --- a/src/conex_sub.F +++ b/src/conex_sub.F @@ -10963,7 +10963,7 @@ c Pions and pions 0 from charged Kaons if(ifdkz.gt.0)then luseCompress = (index(fndkz(1:nfndkz), ".bz2") .eq. nfndkz-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfnwle)) + call CorDataOpenFile(fndkz(1:nfndkz)) call CorDataFillArray(akz, size(akz)) call CorDataFillArray(akz0, size(akz0)) call CorDataCloseFile() @@ -10984,7 +10984,7 @@ c Pions and pions 0 from Kaon Long if(ifdkl.gt.0)then luseCompress = (index(fndkl(1:nfndkl), ".bz2") .eq. nfndkl-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndkl)) + call CorDataOpenFile(fndkl(1:nfndkl)) call CorDataFillArray(akl, size(akl)) call CorDataFillArray(akl0, size(akl0)) call CorDataCloseFile() @@ -11003,7 +11003,7 @@ c Pions and pions 0 from Kaon short if(ifdks.gt.0)then luseCompress = (index(fndks(1:nfndks), ".bz2") .eq. nfndks-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndks)) + call CorDataOpenFile(fndks(1:nfndks)) call CorDataFillArray(aks, size(aks)) call CorDataFillArray(aks0, size(aks0)) call CorDataCloseFile() @@ -11022,7 +11022,7 @@ c Muons from Charge Kaon, Kaon Long and Charged Pions if(ifdkm.gt.0)then luseCompress = (index(fndkm(1:nfndkm), ".bz2") .eq. nfndkm-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndkm)) + call CorDataOpenFile(fndkm(1:nfndkm)) call CorDataFillArray(akzm, size(akzm)) call CorDataFillArray(aklm, size(aklm)) call CorDataFillArray(apim, size(apim)) @@ -11043,7 +11043,7 @@ c Electrons from Charge Kaon or Kaon Long and Gammas from Neutral Pions if(ifdke.gt.0)then luseCompress = (index(fndke(1:nfndke), ".bz2") .eq. nfndke-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndke)) + call CorDataOpenFile(fndke(1:nfndke)) call CorDataFillArray(akze, size(akze)) call CorDataFillArray(akle, size(akle)) call CorDataFillArray(ap0g, size(ap0g)) @@ -11065,7 +11065,7 @@ c Neutrinos from Charge Kaon, Kaon Long and Charged Pions if(ifdkn.gt.0)then luseCompress = (index(fndkn(1:nfndkn), ".bz2") .eq. nfndkn-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndkn)) + call CorDataOpenFile(fndkn(1:nfndkn)) call CorDataFillArray(akzn, size(akzn)) call CorDataFillArray(akln, size(akln)) call CorDataFillArray(apin, size(apin)) @@ -11947,7 +11947,7 @@ c Pions and pions 0 from charged Kaons if(ifdkz.gt.0)then luseCompress = (index(fndkz(1:nfndkz), ".bz2") .eq. nfndkz-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfnwle)) + call CorDataOpenFile(fndkz(1:nfndkz)) call CorDataFillArray(akz, size(akz)) call CorDataFillArray(akz0, size(akz0)) call CorDataCloseFile() @@ -11965,7 +11965,7 @@ c Pions and pions 0 from Kaon Long if(ifdkl.gt.0)then luseCompress = (index(fndkl(1:nfndkl), ".bz2") .eq. nfndkl-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndkl)) + call CorDataOpenFile(fndkl(1:nfndkl)) call CorDataFillArray(akl, size(akl)) call CorDataFillArray(akl0, size(akl0)) call CorDataCloseFile() @@ -11983,7 +11983,7 @@ c Pions and pions 0 from Kaon short if(ifdks.gt.0)then luseCompress = (index(fndks(1:nfndks), ".bz2") .eq. nfndks-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndks)) + call CorDataOpenFile(fndks(1:nfndks)) call CorDataFillArray(aks, size(aks)) call CorDataFillArray(aks0, size(aks0)) call CorDataCloseFile() @@ -12001,7 +12001,7 @@ c Muons from Charge Kaon, Kaon Long and Charged Pions if(ifdkm.gt.0)then luseCompress = (index(fndkm(1:nfndkm), ".bz2") .eq. nfndkm-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndkm)) + call CorDataOpenFile(fndkm(1:nfndkm)) call CorDataFillArray(akzm, size(akzm)) call CorDataFillArray(aklm, size(aklm)) call CorDataFillArray(apim, size(apim)) @@ -12020,7 +12020,7 @@ c Neutrinos from Charge Kaon, Kaon Long and Charged Pions if(ifdkn.gt.0)then luseCompress = (index(fndkn(1:nfndkn), ".bz2") .eq. nfndkn-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndkn)) + call CorDataOpenFile(fndkn(1:nfndkn)) call CorDataFillArray(akzn, size(akzn)) call CorDataFillArray(akln, size(akln)) call CorDataFillArray(apin, size(apin)) @@ -12192,7 +12192,7 @@ c Electrons from Charge Kaon or Kaon Long and Gammas from Neutral Pions if(ifdke.gt.0)then luseCompress = (index(fndke(1:nfndke), ".bz2") .eq. nfndke-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndke)) + call CorDataOpenFile(fndke(1:nfndke)) call CorDataFillArray(akze, size(akze)) call CorDataFillArray(akle, size(akle)) call CorDataFillArray(ap0g, size(ap0g)) @@ -36838,7 +36838,7 @@ c Pi0 from Charge Kaon or Kaon Long if(ifdks.gt.0)then luseCompress = (index(fndks(1:nfndks), ".bz2") .eq. nfndks-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndks)) + call CorDataOpenFile(fndks(1:nfndks)) call CorDataFillArray(aks, size(aks)) call CorDataFillArray(aks0, size(aks0)) call CorDataCloseFile() @@ -36955,7 +36955,7 @@ c Electrons from Charge Kaon or Kaon Long if(ifdke.gt.0)then luseCompress = (index(fndke(1:nfndke), ".bz2") .eq. nfndke-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndke)) + call CorDataOpenFile(fndke(1:nfndke)) call CorDataFillArray(akze, size(akze)) call CorDataFillArray(akle, size(akle)) call CorDataFillArray(ap0g, size(ap0g)) @@ -37023,7 +37023,7 @@ c Muons from Charge Kaon or Kaon Long or charged pion if(ifdkm.gt.0)then luseCompress = (index(fndkm(1:nfndkm), ".bz2") .eq. nfndkm-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndkm)) + call CorDataOpenFile(fndkm(1:nfndkm)) call CorDataFillArray(akzm, size(akzm)) call CorDataFillArray(aklm, size(aklm)) call CorDataFillArray(apim, size(apim)) @@ -37095,7 +37095,7 @@ c Neutrinos from Charge Kaon or Kaon Long or charged pion if(ifdkn.gt.0)then luseCompress = (index(fndkn(1:nfndkn), ".bz2") .eq. nfndkn-3) if (luseCompress.ne.0) then - call CorDataOpenFile(fnwle(1:nfndkn)) + call CorDataOpenFile(fndkn(1:nfndkn)) call CorDataFillArray(akzn, size(akzn)) call CorDataFillArray(akln, size(akln)) call CorDataFillArray(apin, size(apin)) -- GitLab