Code causing warning messages during compilation corrected.

diff --git a/TFluka/TFluka.cxx b/TFluka/TFluka.cxx
index e20f5be7e7bbd3b043842668602d3038f60536d9..000314a10b753d76939db3dd84888d7412a5e535 100644 (file)
--- a/TFluka/TFluka.cxx
+++ b/TFluka/TFluka.cxx
@@ -2190,24 +2190,24 @@ Bool_t   TFluka::IsTrackOut() const
 // Icode = 32: escape - call from Kasneu
 // Icode = 40: escape - call from Kashea
 // Icode = 51: escape - call from Kasoph
 // Icode = 32: escape - call from Kasneu
 // Icode = 40: escape - call from Kashea
 // Icode = 51: escape - call from Kasoph

-  if (iIcode == 14 ||
-      iIcode == 23 ||
-      iIcode == 32 ||
-      iIcode == 40 ||
-      iIcode == 51) return 1;
+  if (fIcode == 14 ||
+      fIcode == 23 ||
+      fIcode == 32 ||
+      fIcode == 40 ||
+      fIcode == 51) return 1;

   else return 0;
 }
 
 Bool_t   TFluka::IsTrackDisappeared() const
 {
 // means all inelastic interactions and decays
   else return 0;
 }
 
 Bool_t   TFluka::IsTrackDisappeared() const
 {
 // means all inelastic interactions and decays

-// iIcode from usdraw
-  if (iIcode == 101 || // inelastic interaction
-      iIcode == 102 || // particle decay
-      iIcode == 214 || // in-flight annihilation
-      iIcode == 215 || // annihilation at rest
-      iIcode == 217 || // pair production
-      iIcode == 221) return 1;
+// fIcode from usdraw
+  if (fIcode == 101 || // inelastic interaction
+      fIcode == 102 || // particle decay
+      fIcode == 214 || // in-flight annihilation
+      fIcode == 215 || // annihilation at rest
+      fIcode == 217 || // pair production
+      fIcode == 221) return 1;

   else return 0;
 }
 
   else return 0;
 }
 


@@ -2224,15 +2224,15 @@ Bool_t   TFluka::IsTrackStop() const
 // Icode = 33: time kill               - call from Kasneu
 // Icode = 41: time kill               - call from Kashea
 // Icode = 52: time kill               - call from Kasoph
 // Icode = 33: time kill               - call from Kasneu
 // Icode = 41: time kill               - call from Kashea
 // Icode = 52: time kill               - call from Kasoph

-  if (iIcode == 12 ||
-      iIcode == 15 ||
-      iIcode == 21 ||
-      iIcode == 22 ||
-      iIcode == 24 ||
-      iIcode == 31 ||
-      iIcode == 33 ||
-      iIcode == 41 ||
-      iIcode == 52) return 1;
+  if (fIcode == 12 ||
+      fIcode == 15 ||
+      fIcode == 21 ||
+      fIcode == 22 ||
+      fIcode == 24 ||
+      fIcode == 31 ||
+      fIcode == 33 ||
+      fIcode == 41 ||
+      fIcode == 52) return 1;

   else return 0;
 }
 
   else return 0;
 }
 


@@ -2299,7 +2299,7 @@ void     TFluka::GetSecondary(Int_t isec, Int_t& particleId,
     Warning("GetSecondary","no secondaries available");
 } // end of GetSecondary
 
     Warning("GetSecondary","no secondaries available");
 } // end of GetSecondary
 

-TMCProcess TFluka::ProdProcess(Int_t isec) const
+TMCProcess TFluka::ProdProcess() const

 // Name of the process that has produced the secondary particles
 // in the current step
 {
 // Name of the process that has produced the secondary particles
 // in the current step
 {


@@ -2327,29 +2327,29 @@ TMCProcess TFluka::ProdProcess(Int_t isec) const
 //  const TMCProcess kIpPSynchrotron = kPSynchrotron;
 
     Int_t mugamma = TRACKR.jtrack == 7 || TRACKR.jtrack == 10 || TRACKR.jtrack == 11;
 //  const TMCProcess kIpPSynchrotron = kPSynchrotron;
 
     Int_t mugamma = TRACKR.jtrack == 7 || TRACKR.jtrack == 10 || TRACKR.jtrack == 11;

-    if (iIcode == 102) return kIpPDecay;
-    else if (iIcode == 104 || iIcode == 217) return kIpPPair;
-//  else if (iIcode == 104) return kIpPairFromPhoton;
-//  else if (iIcode == 217) return kIpPPairFromVirtualPhoton;
-    else if (iIcode == 219) return kIpPCompton;
-    else if (iIcode == 221) return kIpPPhotoelectric;
-    else if (iIcode == 105 || iIcode == 208) return kIpPBrem;
-//  else if (iIcode == 105) return kIpPBremFromHeavy;
-//  else if (iIcode == 208) return kPBremFromElectronOrPositron;
-    else if (iIcode == 103 || iIcode == 400) return kIpPDeltaRay;
-    else if (iIcode == 210 || iIcode == 212) return kIpPDeltaRay;
-//  else if (iIcode == 210) return kIpPMoller;
-//  else if (iIcode == 212) return kIpPBhabha;
-    else if (iIcode == 214 || iIcode == 215) return kIpPAnnihilation;
-//  else if (iIcode == 214) return kIpPAnnihilInFlight;
-//  else if (iIcode == 215) return kIpPAnnihilAtRest;
-    else if (iIcode == 101) return kIpPHadronic;
-    else if (iIcode == 101) {
+    if (fIcode == 102) return kIpPDecay;
+    else if (fIcode == 104 || fIcode == 217) return kIpPPair;
+//  else if (fIcode == 104) return kIpPairFromPhoton;
+//  else if (fIcode == 217) return kIpPPairFromVirtualPhoton;
+    else if (fIcode == 219) return kIpPCompton;
+    else if (fIcode == 221) return kIpPPhotoelectric;
+    else if (fIcode == 105 || fIcode == 208) return kIpPBrem;
+//  else if (fIcode == 105) return kIpPBremFromHeavy;
+//  else if (fIcode == 208) return kPBremFromElectronOrPositron;
+    else if (fIcode == 103 || fIcode == 400) return kIpPDeltaRay;
+    else if (fIcode == 210 || fIcode == 212) return kIpPDeltaRay;
+//  else if (fIcode == 210) return kIpPMoller;
+//  else if (fIcode == 212) return kIpPBhabha;
+    else if (fIcode == 214 || fIcode == 215) return kIpPAnnihilation;
+//  else if (fIcode == 214) return kIpPAnnihilInFlight;
+//  else if (fIcode == 215) return kIpPAnnihilAtRest;
+    else if (fIcode == 101) return kIpPHadronic;
+    else if (fIcode == 101) {

       if (!mugamma) return kIpPHadronic;
       else if (TRACKR.jtrack == 7) return kIpPPhotoFission;
       else return kIpPMuonNuclear;
     }
       if (!mugamma) return kIpPHadronic;
       else if (TRACKR.jtrack == 7) return kIpPPhotoFission;
       else return kIpPMuonNuclear;
     }

-    else if (iIcode == 225) return kIpPRayleigh;
+    else if (fIcode == 225) return kIpPRayleigh;

 // Fluka codes 100, 300 and 400 still to be investigasted
     else return kIpNoProc;
 }
 // Fluka codes 100, 300 and 400 still to be investigasted
     else return kIpNoProc;
 }

diff --git a/TFluka/TFluka.h b/TFluka/TFluka.h
index 99d1850fa81c52ebebfe90f7dcec8029883d51cc..9cb257fbb23bc82262b65bf93e3ef6c6a03ccfe2 100644 (file)
--- a/TFluka/TFluka.h
+++ b/TFluka/TFluka.h
@@ -102,13 +102,13 @@ class TFluka : public TVirtualMC {
   
   
   // functions for drawing
   
   
   // functions for drawing

-  virtual void  DrawOneSpec(const char* name)
+  virtual void  DrawOneSpec(const char* /*name*/)

     {printf("WARNING: DrawOneSpec not yet implemented !\n");}
     {printf("WARNING: DrawOneSpec not yet implemented !\n");}

-  virtual void  Gsatt(const char* name, const char* att, Int_t val)
+  virtual void  Gsatt(const char* /*name*/, const char* /*att*/, Int_t /*val*/)

     {printf("WARNING: Gsatt not yet implemented !\n");}
     {printf("WARNING: Gsatt not yet implemented !\n");}

-  virtual void  Gdraw(const char*,Double_t theta = 30, Double_t phi = 30,
-                     Double_t psi = 0, Double_t u0 = 10, Double_t v0 = 10,
-                     Double_t ul = 0.01, Double_t vl = 0.01)
+  virtual void  Gdraw(const char*,Double_t /*theta = 30*/, Double_t /*phi = 30*/,
+                     Double_t /*psi = 0*/, Double_t /*u0 = 10*/, Double_t /*v0 = 10*/,
+                     Double_t /*ul = 0.01*/, Double_t /*vl = 0.01*/)

     {printf("WARNING: Gdraw not yet implemented !\n");}
   
   // Euclid
     {printf("WARNING: Gdraw not yet implemented !\n");}
   
   // Euclid


@@ -204,8 +204,8 @@ class TFluka : public TVirtualMC {
   virtual Int_t    NSecondaries() const ;
   virtual void     GetSecondary(Int_t isec, Int_t& particleId, 
                        TLorentzVector& position, TLorentzVector& momentum);
   virtual Int_t    NSecondaries() const ;
   virtual void     GetSecondary(Int_t isec, Int_t& particleId, 
                        TLorentzVector& position, TLorentzVector& momentum);

-  virtual TMCProcess ProdProcess(Int_t isec) const ;
-  virtual Int_t    StepProcesses(TArrayI &proc) const
+  virtual TMCProcess ProdProcess() const ;
+  virtual Int_t    StepProcesses(TArrayI &/*proc*/) const

     {printf("WARNING: StepProcesses not yet implemented !\n"); return -1;}
   
   
     {printf("WARNING: StepProcesses not yet implemented !\n"); return -1;}
   
   


@@ -283,13 +283,13 @@ class TFluka : public TVirtualMC {
   // mgdraw = 4
   // sodraw = 5
   // usdraw = 6
   // mgdraw = 4
   // sodraw = 5
   // usdraw = 6

-  Int_t GetCaller() const {return iCaller;}
-  void SetCaller(Int_t l) {iCaller = l;}
+  Int_t GetCaller() const {return fCaller;}
+  void SetCaller(Int_t l) {fCaller = l;}

   
   // - Fluka Draw procedures formal parameters
   
   // - Fluka Draw procedures formal parameters

-  Int_t GetIcode() const {return iIcode;}
-  void SetIcode(Int_t l) {iIcode = l;}
-  // in the case of sodraw iIcode=0
+  Int_t GetIcode() const {return fIcode;}
+  void SetIcode(Int_t l) {fIcode = l;}
+  // in the case of sodraw fIcode=0

 
   Int_t GetMreg() const {return fCurrentFlukaRegion;}
   void SetMreg(Int_t l) {fCurrentFlukaRegion = l;}
 
   Int_t GetMreg() const {return fCurrentFlukaRegion;}
   void SetMreg(Int_t l) {fCurrentFlukaRegion = l;}


@@ -323,7 +323,7 @@ class TFluka : public TVirtualMC {
   virtual void     FutoTest() ;
 
  private:
   virtual void     FutoTest() ;
 
  private:

-  TFluka(const TFluka &mc){}
+  TFluka(const TFluka &mc): TVirtualMC(mc) {;}

   TFluka & operator=(const TFluka &) {return (*this);}
 
  protected:
   TFluka & operator=(const TFluka &) {return (*this);}
 
  protected:


@@ -332,8 +332,8 @@ class TFluka : public TVirtualMC {
   TString sInputFileName;     //Name of the real input file (e.g. alice.inp)
   TString sCoreInputFileName; //Name of the input file (e.g. corealice.inp)
 
   TString sInputFileName;     //Name of the real input file (e.g. alice.inp)
   TString sCoreInputFileName; //Name of the input file (e.g. corealice.inp)
 

-  Int_t    iCaller; //Parameter to indicate who is the caller of the Fluka Draw
-  Int_t    iIcode;  //Fluka Draw procedures formal parameter 
+  Int_t    fCaller; //Parameter to indicate who is the caller of the Fluka Draw
+  Int_t    fIcode;  //Fluka Draw procedures formal parameter 

   Int_t    iNewreg; //Fluka Draw procedures formal parameter
   Double_t fRull;   //Fluka Draw procedures formal parameter
   Double_t fXsco;   //Fluka Draw procedures formal parameter
   Int_t    iNewreg; //Fluka Draw procedures formal parameter
   Double_t fRull;   //Fluka Draw procedures formal parameter
   Double_t fXsco;   //Fluka Draw procedures formal parameter

diff --git a/TFluka/endraw.cxx b/TFluka/endraw.cxx
index 2bd40d253094f27c4a10dac5d3e7d04bcc70511d..ff72ceb8f8fffe8055a4619bda9a402846ec36ba 100644 (file)
--- a/TFluka/endraw.cxx
+++ b/TFluka/endraw.cxx
@@ -17,6 +17,7 @@ void endraw(Int_t& icode, Int_t& mreg, Double_t& rull, Double_t& xsco, Double_t&
   ((TFluka*) gMC)->SetXsco(xsco);
   ((TFluka*) gMC)->SetYsco(ysco);
   ((TFluka*) gMC)->SetZsco(zsco);
   ((TFluka*) gMC)->SetXsco(xsco);
   ((TFluka*) gMC)->SetYsco(ysco);
   ((TFluka*) gMC)->SetZsco(zsco);

+  ((TFluka*) gMC)->SetMreg(mreg);

   (TVirtualMCApplication::Instance())->Stepping();
 } // end of endraw
 } // end of extern "C"
   (TVirtualMCApplication::Instance())->Stepping();
 } // end of endraw
 } // end of extern "C"

diff --git a/TFluka/stuprf.cxx b/TFluka/stuprf.cxx
index dc5b6ef6b65c3f8ab3a897e36de9ee233d146201..932486c759ee2cbab01749826a535dfefa4fee7b 100644 (file)
--- a/TFluka/stuprf.cxx
+++ b/TFluka/stuprf.cxx
@@ -26,9 +26,9 @@
 #include "TVector3.h"
 
 extern "C" {
 #include "TVector3.h"
 
 extern "C" {

-void stuprf(Int_t& ij, Int_t& mreg,
-            Double_t& xx, Double_t& yy, Double_t& zz,
-           Int_t& numsec, Int_t& npprmr)
+    void stuprf(Int_t& /*ij*/, Int_t& /*mreg*/,
+               Double_t& xx, Double_t& yy, Double_t& zz,
+               Int_t& numsec, Int_t& npprmr)

 {
 //*----------------------------------------------------------------------*
 //*                                                                      *
 {
 //*----------------------------------------------------------------------*
 //*                                                                      *


@@ -66,7 +66,7 @@ void stuprf(Int_t& ij, Int_t& mreg,
 // clarify with Alberto
   if (numsec > npprmr) {
 // Now call the PushTrack(...)
 // clarify with Alberto
   if (numsec > npprmr) {
 // Now call the PushTrack(...)

-    Int_t done = 1;
+    Int_t done = 0;

 
     Int_t parent =  TRACKR.ispusr[mkbmx2-1];
 
 
     Int_t parent =  TRACKR.ispusr[mkbmx2-1];