Fixes for cmake

[u/mrichter/AliRoot.git] / THerwig / THerwig6.cxx

diff --git a/THerwig/THerwig6.cxx b/THerwig/THerwig6.cxx
index 47ac6a31f3a5be0835089efe7802dce688a15d2a..d5781deb6ea42bb3f2cd95cf55e58a944af9c072 100644 (file)
--- a/THerwig/THerwig6.cxx
+++ b/THerwig/THerwig6.cxx
@@ -216,7 +216,7 @@ void THerwig6::Initialize(const char *beam, const char *target, double pbeam1, d
   // value after calling Initialize and before PrepareRun.
 
    char  cbeam[8];
-   strncpy(cbeam,beam,8);
+    strncpy(cbeam,beam,8);
    char  ctarget[8];
    strncpy(ctarget,target,8);
    printf("\n Initializing Herwig !! \n");
@@ -277,16 +277,16 @@ void THerwig6::Initialize(const char *beam, const char *target, double pbeam1, d
    fHwproc->IPROC=iproc;
    // not used in the class definition
    fHwproc->MAXEV=1;
-
+   
    // reset all parameters
    hwigin_();
 
    // set correct title
-   char atitle[132];
+   //char atitle[132];
    double win=pbeam1+pbeam2;
-   printf("\n %s - %s at %g GeV",beam,target,win);
-   sprintf(atitle,"%s-%s at %g GeV",cbeam,ctarget,win);
-   SetTitle(atitle);
+   printf("\n %s - %s at %g GeV \n",beam,target,win);
+   //sprintf(atitle,"%s-%s at %g GeV",cbeam,ctarget,win);
+   //SetTitle(atitle);
 }
 
 void THerwig6::InitializeJimmy(const char *beam, const char *target, double pbeam1, double pbeam2, int iproc)
@@ -367,11 +367,11 @@ void THerwig6::InitializeJimmy(const char *beam, const char *target, double pbea
    jimmin_();
 
    // set correct title
-   char atitle[132];
+//   char atitle[132];
    double win=pbeam1+pbeam2;
    printf("\n %s - %s at %g GeV",beam,target,win);
-   sprintf(atitle,"%s-%s at %g GeV",cbeam,ctarget,win);
-   SetTitle(atitle);
+//   sprintf(atitle,"%s-%s at %g GeV",cbeam,ctarget,win);
+//   SetTitle(atitle);
 }
 
 void THerwig6::PrepareRun()
@@ -407,7 +407,7 @@ TObjArray* THerwig6::ImportParticles(Option_t *option)
   Int_t numpart = fHepevt->NHEP;
   TClonesArray &a = *((TClonesArray*)fParticles);
   if (!strcmp(option,"") || !strcmp(option,"Final")) {
-    for (Int_t i = 0; i<=numpart; i++) {
+    for (Int_t i = 0; i < numpart; i++) {
       if (fHepevt->ISTHEP[i] == 1) {
 //
 //  Use the common block values for the TParticle constructor
@@ -432,7 +432,7 @@ TObjArray* THerwig6::ImportParticles(Option_t *option)
      }
   }
   else if (!strcmp(option,"All")) {
-    for (Int_t i = 0; i<=numpart; i++) {
+    for (Int_t i = 0; i < numpart; i++) {
       new(a[i]) TParticle(
                                    fHepevt->IDHEP[i],
                                    fHepevt->ISTHEP[i],
@@ -473,7 +473,7 @@ Int_t THerwig6::ImportParticles(TClonesArray *particles, Option_t *option)
   refParticles.Clear();
   Int_t numpart = fHepevt->NHEP;
   if (!strcmp(option,"") || !strcmp(option,"Final")) {
-    for (Int_t i = 0; i< numpart; i++) {
+    for (Int_t i = 0; i < numpart; i++) {
       if (fHepevt->ISTHEP[i] == 1) {
 //
 //  Use the common block values for the TParticle constructor
@@ -530,7 +530,7 @@ void THerwig6::Hwuinc()
   hwuinc_();
 }
 
-void THerwig6::Hwusta(char* name)
+void THerwig6::Hwusta(const char* name)
 
 {
   hwusta_(name,8);