#99585: Porting request for J/psi production: additional changes to c…

…ompile

CMakeLists.txt

@@ -126,7 +126,7 @@ set(BINLIBDIRS "-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 
 # Standard Modules
 # ------------------------------
-set(ALIROOTMODULES STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS ACORDE HMPID T0 BCM STRUCT VZERO THijing THbtp EMCAL THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS JETAN HLT STAT TTherminator CORRFW DPMJET TDPMjet PWG0 PWG1 PWG2 PWG3 PWG4 TRIGGER PYTHIA8 TAmpt OADB )
+set(ALIROOTMODULES STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS ACORDE HMPID T0 BCM STRUCT VZERO THijing THbtp EMCAL THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS JETAN HLT STAT TTherminator CORRFW DPMJET TDPMjet PWG0 PWG1 PWG2 PWG3 PWG4 TRIGGER PYTHIA8 TAmpt OADB TEvtGen )
 
 if(THydjet)
   list(APPEND ALIROOTMODULES THydjet)

TEvtGen/CMakelibphotos.pkg

@@ -29,4 +29,4 @@ set ( FSRCS  PHOTOS/phcork.F PHOTOS/phint.F PHOTOS/phint1.F PHOTOS/phlupa.F PHOT
 
 set ( EINCLUDE )
 
-set ( PACKFFLAGS  ${FFLAGS} -IPYTHIA6  -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET})
+set ( PACKFFLAGS  "${FFLAGS} -IPYTHIA6  -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET}")

TEvtGen/EvtGenBase/EvtStreamInputIterator.hh

@@ -23,7 +23,6 @@ public:
 
   typedef input_iterator_tag iterator_category;
   typedef Point              value_type;
-  typedef ptrdiff_t          difference_type;
   typedef const Point*       pointer;
   typedef const Point&       reference;
 

TEvtGen/EvtGenModels/EvtPyGaGa.cxx

@@ -36,10 +36,10 @@ extern "C" {
   extern void pystat_(int &);
 }
 
-extern struct
-{
-  int dc[18];
-} decaych_;
+// extern struct
+// {
+//   int dc[18];
+// } decaych_;
 
 EvtPyGaGa::~EvtPyGaGa()
 {
@@ -61,8 +61,8 @@ void EvtPyGaGa::init()
 {
   // check that there are 1 argument
   checkNArg(0);
-  for( int i=0; i<18; i++)
-    decaych_.dc[i]=0;
+  // for( int i=0; i<18; i++)
+  //   decaych_.dc[i]=0;
 }
 
 void EvtPyGaGa::initProbMax()

TEvtGen/EvtGenModels/EvtPycont.cxx

@@ -36,10 +36,10 @@ extern "C" {
   extern void pystat_(int &);
 }
 
-extern struct
-{
-  int dc[18];
-} decaych_;
+// extern struct
+// {
+//   int dc[18];
+// } decaych_;
 
 
 EvtPycont::~EvtPycont() {
@@ -68,28 +68,28 @@ void EvtPycont::init()
   }
   checkNArg(0,12);
 
-   for( int i=0; i<18; i++)
-     decaych_.dc[i]=0;
-   if ( getNArg() == 12 ) {
-     decaych_.dc[0]=(int)getArg(0);
-     decaych_.dc[1]=(int)getArg(1);
-     decaych_.dc[2]=(int)getArg(2);
-     decaych_.dc[3]=(int)getArg(3);
-     decaych_.dc[4]=(int)getArg(4);
-     decaych_.dc[5]=(int)getArg(5);
-     decaych_.dc[10]=(int)getArg(6);
-     decaych_.dc[11]=(int)getArg(7);
-     decaych_.dc[12]=(int)getArg(8);
-     decaych_.dc[13]=(int)getArg(9);
-     decaych_.dc[14]=(int)getArg(10);
-     decaych_.dc[15]=(int)getArg(11);
-   }
-   else{
-     decaych_.dc[0]=1;
-     decaych_.dc[1]=1;
-     decaych_.dc[2]=1;
-     decaych_.dc[3]=1;
-   }
+   // for( int i=0; i<18; i++)
+   //   decaych_.dc[i]=0;
+   // if ( getNArg() == 12 ) {
+   //   decaych_.dc[0]=(int)getArg(0);
+   //   decaych_.dc[1]=(int)getArg(1);
+   //   decaych_.dc[2]=(int)getArg(2);
+   //   decaych_.dc[3]=(int)getArg(3);
+   //   decaych_.dc[4]=(int)getArg(4);
+   //   decaych_.dc[5]=(int)getArg(5);
+   //   decaych_.dc[10]=(int)getArg(6);
+   //   decaych_.dc[11]=(int)getArg(7);
+   //   decaych_.dc[12]=(int)getArg(8);
+   //   decaych_.dc[13]=(int)getArg(9);
+   //   decaych_.dc[14]=(int)getArg(10);
+   //   decaych_.dc[15]=(int)getArg(11);
+   // }
+   // else{
+   //   decaych_.dc[0]=1;
+   //   decaych_.dc[1]=1;
+   //   decaych_.dc[2]=1;
+   //   decaych_.dc[3]=1;
+   // }
 
 }