Protect instants of common blocks (Christian)
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 15 May 2007 12:41:09 +0000 (12:41 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 15 May 2007 12:41:09 +0000 (12:41 +0000)
TPHIC/TPHICcommon.h
TPHIC/TPHICgen.cxx

index b3e4e15..2a0a4e1 100644 (file)
@@ -47,8 +47,10 @@ extern "C" {
     Int_t   kv2;
     Float_t qvpar[4];
   } GGiniCommon;
+#ifdef IN_TPHICGEN_CXX
 #define GGINI  COMMON_BLOCK(GGINI,ggini)
   COMMON_BLOCK_DEF(GGiniCommon,GGINI);
+#endif
 
 //       COMMON /ggevnt/ nrun,ievent,wsq,ygg,xmg1,xmg2, p2g(5),
 //      &                ptag1(4),ptag2(4), ngg, kgg(10),pgg(20,5)
@@ -67,7 +69,9 @@ extern "C" {
     Float_t pgg[5][20];
   } GGevntCommon;
 #define GGEVNT COMMON_BLOCK(GGEVNT,ggevnt)
+#ifdef IN_TPHICGEN_CXX
   COMMON_BLOCK_DEF(GGevntCommon,GGEVNT);
+#endif
 
 //       COMMON /ggxs/ xsmax0, xscur0, xscur, xsbra, xssum, ntry, xstot,
 //      &  xstote, ssbr(10)
@@ -82,8 +86,10 @@ extern "C" {
     Float_t xstote;
     Float_t ssbr[10];
   } GGxsCommon;
+#ifdef IN_TPHICGEN_CXX
 #define GGXS   COMMON_BLOCK(GGXS,ggxs)
   COMMON_BLOCK_DEF(GGxsCommon,GGXS);
+#endif
 
 }
 
index 09cf434..97568df 100644 (file)
@@ -26,6 +26,7 @@
 #include "TPHICgen.h"
 #include "TClonesArray.h"
 #include "TParticle.h"
+#define IN_TPHICGEN_CXX
 #include "TPHICcommon.h"
 
 #ifndef WIN32