diff -r -c -w -B -xCVS -xMakefile geant3-old/TGeant3/TGeant3.cxx geant3-at/TGeant3/TGeant3.cxx
*** geant3-old/TGeant3/TGeant3.cxx	Sun Jun 20 19:00:27 2004
--- geant3-at/TGeant3/TGeant3.cxx	Sun Jun 20 19:01:32 2004
***************
*** 1503,1509 ****
  }
  
  //_____________________________________________________________________________
! Bool_t  TGeant3::SetCut(const char* cutName, Double_t cutValue)
  {
    //
    // Set transport cuts for particles
--- 1503,1511 ----
  }
  
  //_____________________________________________________________________________
! //Bool_t  
! void
! TGeant3::SetCut(const char* cutName, Double_t cutValue)
  {
    //
    // Set transport cuts for particles
***************
*** 1537,1547 ****
      success = kFALSE;
    }
    
!   return success;
  }
  
  //_____________________________________________________________________________
! Bool_t  TGeant3::SetProcess(const char* flagName, Int_t flagValue)
  {
    //
    // Set thresholds for different processes
--- 1539,1551 ----
      success = kFALSE;
    }
    
!   // return success;
  }
  
  //_____________________________________________________________________________
! // Bool_t  
! void
! TGeant3::SetProcess(const char* flagName, Int_t flagValue)
  {
    //
    // Set thresholds for different processes
***************
*** 1585,1595 ****
      success = kFALSE;
    }
    
!   return  success; 
  }
   
   //_____________________________________________________________________________
! Bool_t TGeant3::DefineParticle(Int_t pdg, const char* name, TMCParticleType type,
                        Double_t mass, Double_t charge, Double_t lifetime)
  {
  // 
--- 1589,1601 ----
      success = kFALSE;
    }
    
!   // return  success; 
  }
   
   //_____________________________________________________________________________
! // Bool_t 
! void
! TGeant3::DefineParticle(Int_t pdg, const char* name, TMCParticleType type,
                        Double_t mass, Double_t charge, Double_t lifetime)
  {
  // 
***************
*** 1602,1615 ****
    // in TGeant3
    if (IdFromPDG(pdg) > 0) {
      Error("SetParticle", "Particle already exists.");
!     return kFALSE;
    }  
  
    // Check if particle type is known to Geant3
    Int_t itrtyp = TransportMethod(type);
    if (itrtyp < 0) {
      Error("SetParticle", "Unknown particle transport.");
!     return kFALSE;
    }
  
    // Add particle to Geant3  
--- 1608,1623 ----
    // in TGeant3
    if (IdFromPDG(pdg) > 0) {
      Error("SetParticle", "Particle already exists.");
!     // return kFALSE;
!     return;
    }  
  
    // Check if particle type is known to Geant3
    Int_t itrtyp = TransportMethod(type);
    if (itrtyp < 0) {
      Error("SetParticle", "Unknown particle transport.");
!     // return kFALSE;
!     return;
    }
  
    // Add particle to Geant3  
***************
*** 1623,1633 ****
                      ParticleClass(type).Data(), pdg);
    fPDGCode[fNPDGCodes++] = pdg;
    
!   return kTRUE;
  }
  
  //_____________________________________________________________________________
! Bool_t  TGeant3::DefineIon(const char* name, Int_t Z, Int_t A, Int_t Q, 
                             Double_t excEnergy, Double_t mass)
  {
  //
--- 1631,1643 ----
                      ParticleClass(type).Data(), pdg);
    fPDGCode[fNPDGCodes++] = pdg;
    
!   // return kTRUE;
  }
  
  //_____________________________________________________________________________
! // Bool_t  
! void
! TGeant3::DefineIon(const char* name, Int_t Z, Int_t A, Int_t Q, 
  		   Double_t excEnergy, Double_t mass)
  {
  //
***************
*** 1645,1651 ****
        pdg++;
    if (TDatabasePDG::Instance()->GetParticle(pdg)) {
        Fatal("SetIon", "All isomer numbers are already used");
!       return kFALSE;
    }    
  
    // Particle properties
--- 1655,1662 ----
        pdg++;
    if (TDatabasePDG::Instance()->GetParticle(pdg)) {
        Fatal("SetIon", "All isomer numbers are already used");
!       // return kFALSE;
!       return;
    }    
  
    // Particle properties
***************
*** 1657,1663 ****
    Double_t lifetime = 1.e20;
    
    // Call DefineParticle now
!   return DefineParticle(pdg, name, partType, mass, charge, lifetime);
  }		       
  
  //_____________________________________________________________________________
--- 1668,1675 ----
    Double_t lifetime = 1.e20;
    
    // Call DefineParticle now
!   DefineParticle(pdg, name, partType, mass, charge, lifetime);
!   // return DefineParticle(pdg, name, partType, mass, charge, lifetime);
  }		       
  
  //_____________________________________________________________________________
***************
*** 5725,5731 ****
    Bool_t returnValue = !fStopRun;
    fStopRun = kFALSE;
  
!   return returnValue;
  }
  
  //_____________________________________________________________________________
--- 5739,5745 ----
    Bool_t returnValue = !fStopRun;
    fStopRun = kFALSE;
  
!   // return returnValue;
  }
  
  //_____________________________________________________________________________
diff -r -c -w -B -xCVS -xMakefile geant3-old/TGeant3/TGeant3.h geant3-at/TGeant3/TGeant3.h
*** geant3-old/TGeant3/TGeant3.h	Sun Jun 20 19:00:27 2004
--- geant3-at/TGeant3/TGeant3.h	Sun Jun 20 19:01:41 2004
***************
*** 602,615 ****
    void  SetMaxStep(Double_t maxstep);
    void  SetMaxNStep(Int_t maxnstp);
    Int_t GetMaxNStep() const;
!   Bool_t SetCut(const char* cutName, Double_t cutValue);
!   Bool_t SetProcess(const char* flagName, Int_t flagValue);
    const char *GetPath();
    const char *GetNodeName();
!   Bool_t DefineParticle(Int_t pdg, const char* name, TMCParticleType type,
                     Double_t mass, Double_t charge, Double_t lifetime);
!   Bool_t DefineIon(const char* name, Int_t Z, Int_t A, Int_t Q, 
                     Double_t excEnergy, Double_t mass);
    virtual TString   ParticleName(Int_t pdg) const;	  
    virtual Double_t  ParticleMass(Int_t pdg) const;	  
    virtual Double_t  ParticleCharge(Int_t pdg) const;	  
--- 602,621 ----
    void  SetMaxStep(Double_t maxstep);
    void  SetMaxNStep(Int_t maxnstp);
    Int_t GetMaxNStep() const;
!   // Bool_t SetCut(const char* cutName, Double_t cutValue);
!   void SetCut(const char* cutName, Double_t cutValue);
!   // Bool_t SetProcess(const char* flagName, Int_t flagValue);
!   void SetProcess(const char* flagName, Int_t flagValue);
    const char *GetPath();
    const char *GetNodeName();
!   // Bool_t DefineParticle(Int_t pdg, const char* name, TMCParticleType type,
!   // Double_t mass, Double_t charge, Double_t lifetime);
!   void DefineParticle(Int_t pdg, const char* name, TMCParticleType type,
  		      Double_t mass, Double_t charge, Double_t lifetime);
!   void DefineIon(const char* name, Int_t Z, Int_t A, Int_t Q, 
  		 Double_t excEnergy, Double_t mass);
+   // Bool_t DefineIon(const char* name, Int_t Z, Int_t A, Int_t Q, 
+   // Double_t excEnergy, Double_t mass);
    virtual TString   ParticleName(Int_t pdg) const;	  
    virtual Double_t  ParticleMass(Int_t pdg) const;	  
    virtual Double_t  ParticleCharge(Int_t pdg) const;