Updates needed for FLUKA2005.6

diff --git a/TFluka/Femfrgn.h b/TFluka/Femfrgn.h
index 59d8b9710e7194d81a1cb1ee61a4a388fe28a351..cbada694afe5b1fce93da5d6faccf58aa9705d58 100644 (file)
--- a/TFluka/Femfrgn.h
+++ b/TFluka/Femfrgn.h
@@ -33,8 +33,8 @@ typedef struct {
   Int_t    nollda;
 } emfrgnCommon;
 
-#define EFMRGN COMMON_BLOCK(EFMRGN,efmrgn)
-COMMON_BLOCK_DEF(emfrgnCommon,EFMRGN);
+#define EMFRGN COMMON_BLOCK(EMFRGN,emfrgn)
+COMMON_BLOCK_DEF(emfrgnCommon,EMFRGN);
 }
 
 #endif

diff --git a/TFluka/crnkvp.f b/TFluka/crnkvp.f
index 55198f950464ac7578263bbf3d3bd8dca579a4df..98b7bf54a243f7f4d076c8b2331fe404e6a8d358 100644 (file)
--- a/TFluka/crnkvp.f
+++ b/TFluka/crnkvp.f
@@ -421,10 +421,10 @@ D    &              SCADOT
          POX  = TXPOPP(LSTOPP)
          POY  = TYPOPP(LSTOPP)
          POZ  = TZPOPP(LSTOPP)
-         CALL PushCerenkovPhoton(PXCR, PYCR, PZCR, EPHSMP, XTRKCR, 
+         CALL pshckp(PXCR, PYCR, PZCR, EPHSMP, XTRKCR, 
      &        YTRKCR , ZTRKCR, ATRKCR, POX, POY, POZ, WTRACK, ITFL)
          NPROD = NPROD + 1
-         CALL UserSteppingCKV(NPROD, MREG, XTRKCR, YTRKCR, ZTRKCR)
+         CALL ustckv(NPROD, MREG, XTRKCR, YTRKCR, ZTRKCR)
 *
 *
 *

diff --git a/TFluka/stupre.cxx b/TFluka/stupre.cxx
index 9183498d3b2ba349eeceb13ac518a429084ec1a8..b793f9f27e860a08f30502854084cb5ff1d343b2 100644 (file)
--- a/TFluka/stupre.cxx
+++ b/TFluka/stupre.cxx
@@ -77,13 +77,13 @@ void stupre()
     
 // Ckeck transport cut first
     Int_t ireg = EMFSTK.iremf[kp];
-    Double_t cut = (TMath::Abs(EMFSTK.ichemf[kp]) == 1) ? EFMRGN.elethr[ireg-1] :  EFMRGN.phothr[ireg-1];
+    Double_t cut = (TMath::Abs(EMFSTK.ichemf[kp]) == 1) ? EMFRGN.elethr[ireg-1] :  EMFRGN.phothr[ireg-1];
     Double_t e      = EMFSTK.etemf[kp];
     if ((e < cut) 
        && ( 
            (EMFSTK.ichemf[kp] ==  0) ||
            (EMFSTK.ichemf[kp] == -1) ||
-           (EMFSTK.ichemf[kp] ==  1 &&  EFMRGN.phothr[ireg-1] > emassmev)
+           (EMFSTK.ichemf[kp] ==  1 &&  EMFRGN.phothr[ireg-1] > emassmev)
            )
        )
     {