Ignore:
Timestamp:
Feb 16, 2009, 10:14:30 AM (15 years ago)
Author:
garnier
Message:

en test de gl2ps. Problemes de libraries

Location:
trunk/source/global/management/include
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/global/management/include/G4LPhysicsFreeVector.hh

    r850 r921  
    2525//
    2626//
    27 // $Id: G4LPhysicsFreeVector.hh,v 1.10 2008/04/07 14:18:57 gcosmo Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4LPhysicsFreeVector.hh,v 1.11 2008/09/22 08:26:33 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030//
    … …  
    6262   ~G4LPhysicsFreeVector();
    6363
     64   G4LPhysicsFreeVector(const G4LPhysicsFreeVector&);
     65   G4LPhysicsFreeVector& operator=(const G4LPhysicsFreeVector&);
     66     // Copy constructor and assignment operator.
     67
    6468   void PutValues(size_t binNumber, G4double binValue, G4double dataValue);
    6569     // G4PhysicsVector has PutValue() but it is inconvenient.

  • trunk/source/global/management/include/G4LPhysicsFreeVector.icc

    r850 r921  
    2525//
    2626//
    27 // $Id: G4LPhysicsFreeVector.icc,v 1.11 2008/09/06 19:52:16 vnivanch Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4LPhysicsFreeVector.icc,v 1.13 2008/09/22 08:26:33 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030//
    … …  
    4040//
    4141// F.W. Jones, TRIUMF, 04-JUN-96
    42 // 05 Sep. 2008, V.Ivanchenko : added protections for zero-length vector
    4342// --------------------------------------------------------------------------
    4443
    … …  
    4948  // Want to simultaneously fill the bin and data vectors.
    5049{
    51   if(binNumber <= numberOfBin) {
    52     binVector[binNumber] = binValue;
    53     dataVector[binNumber]= dataValue;
    54     if(0 == binNumber) edgeMin = binValue;
    55     else if( numberOfBin - 1 == binNumber) edgeMax = binValue;
    56   }
     50   binVector[binNumber] = binValue;
     51   dataVector[binNumber] = dataValue;
     52   if(binNumber == 0)
     53     { edgeMin = binValue; }
     54   else if( numberOfBin - 1 == binNumber)
     55     { edgeMax = binValue; }
    5756}
    5857

  • trunk/source/global/management/include/G4PhysicsFreeVector.hh

    r850 r921  
    2525//
    2626//
    27 // $Id: G4PhysicsFreeVector.hh,v 1.10 2006/06/29 19:02:18 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PhysicsFreeVector.hh,v 1.12 2008/09/22 14:49:57 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030//

  • trunk/source/global/management/include/G4PhysicsLinearVector.hh

    r850 r921  
    2525//
    2626//
    27 // $Id: G4PhysicsLinearVector.hh,v 1.10 2006/06/29 19:02:21 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PhysicsLinearVector.hh,v 1.11 2008/09/22 11:37:09 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030//
    … …  
    7373      // Destructor
    7474
     75    G4PhysicsLinearVector(const G4PhysicsLinearVector&);
     76    G4PhysicsLinearVector& operator=(const G4PhysicsLinearVector&);
     77      // Copy constructor and assignment operator.
     78
    7579    G4bool Retrieve(std::ifstream& fIn, G4bool ascii);
    7680

  • trunk/source/global/management/include/G4PhysicsLnVector.hh

    r850 r921  
    2525//
    2626//
    27 // $Id: G4PhysicsLnVector.hh,v 1.12 2006/06/29 19:02:23 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PhysicsLnVector.hh,v 1.13 2008/09/22 11:37:09 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030//
    … …  
    7070      // Destructor.
    7171
     72    G4PhysicsLnVector(const G4PhysicsLnVector&);
     73    G4PhysicsLnVector& operator=(const G4PhysicsLnVector&);
     74      // Copy constructor and assignment operator.
     75
    7276    G4bool Retrieve(std::ifstream& fIn, G4bool ascii);
    7377      // To retrieve persistent data from file stream.

  • trunk/source/global/management/include/G4PhysicsLogVector.hh

    r850 r921  
    2525//
    2626//
    27 // $Id: G4PhysicsLogVector.hh,v 1.11 2006/06/29 19:02:25 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PhysicsLogVector.hh,v 1.13 2008/09/22 08:26:33 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030//
    … …  
    7575      // Destructor
    7676
     77    G4PhysicsLogVector(const G4PhysicsLogVector&);
     78    G4PhysicsLogVector& operator=(const G4PhysicsLogVector&);
     79      // Copy constructor and assignment operator.
     80     
    7781    G4bool Retrieve(std::ifstream& fIn, G4bool ascii);
    7882      // To retrieve persistent data from file stream.
    79 
     83 
    8084  protected:
    8185

  • trunk/source/global/management/include/G4PhysicsOrderedFreeVector.hh

    r850 r921  
    2525//
    2626//
    27 // $Id: G4PhysicsOrderedFreeVector.hh,v 1.9 2006/06/29 19:02:28 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PhysicsOrderedFreeVector.hh,v 1.11 2008/09/22 14:49:57 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030////////////////////////////////////////////////////////////////////////

  • trunk/source/global/management/include/G4PhysicsVector.hh

    r850 r921  
    2525//
    2626//
    27 // $Id: G4PhysicsVector.hh,v 1.17 2008/04/07 14:18:57 gcosmo Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PhysicsVector.hh,v 1.18 2008/09/22 08:26:33 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030//
    … …  
    144144         // Find the bin# in which theEnergy belongs - pure virtual function
    145145
     146    void DeleteData();
     147    void CopyData(const G4PhysicsVector& vec);
     148         // Internal methods for allowing copy of objects
     149
     150  protected:
     151
    146152    typedef std::vector<G4double> G4PVDataVector;
    147153

  • trunk/source/global/management/include/G4PhysicsVector.icc

    r850 r921  
    2525//
    2626//
    27 // $Id: G4PhysicsVector.icc,v 1.14 2008/09/05 18:04:45 vnivanch Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PhysicsVector.icc,v 1.17 2008/09/22 08:26:33 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030//
    … …  
    4141//    energy scale, for example like 'log', 'linear', 'free', etc.
    4242//
    43 // Modified:
    44 // 05 Sep. 2008, V.Ivanchenko : added protections for zero-length vector
    4543//---------------------------------------------------------------
    4644
    … …  
    127125  if( theEnergy == lastEnergy ) {
    128126
    129   } else if( theEnergy <= edgeMin ) {
    130      lastBin = 0;
    131      lastEnergy = theEnergy;
    132      lastValue  = dataVector[0];
    133 
    134127  } else if(theEnergy < lastEnergy && theEnergy >= binVector[lastBin]) {
    135128     lastEnergy = theEnergy;
    136129     Interpolation();
     130
     131  } else if( theEnergy <= edgeMin ) {
     132     lastBin = 0;
     133     lastEnergy = edgeMin;
     134     lastValue  = dataVector[0];
    137135
    138136  } else if(theEnergy < lastEnergy && theEnergy >= binVector[lastBin-1]) {
    … …  
    168166 void G4PhysicsVector::PutValue(size_t binNumber, G4double theValue)
    169167{
    170   if(binNumber < numberOfBin) {
    171     dataVector[binNumber] = theValue;
    172 
    173     // Fill the bin which is hidden to user with theValue. This is to
    174     // handle correctly when Energy=theEmax in getValue.
    175 
    176     if(binNumber==numberOfBin-1) { dataVector[binNumber+1] = theValue; }
    177   }
     168  dataVector[binNumber] = theValue;
     169
     170  // Fill the bin which is hidden to user with theValue. This is to
     171  // handle correctly when Energy=theEmax in getValue.
     172
     173  if(binNumber==numberOfBin-1) { dataVector[binNumber+1] = theValue; }
    178174}
    179175

  • trunk/source/global/management/include/G4Version.hh

    r850 r921  
    2525//
    2626//
    27 // $Id: G4Version.hh,v 1.16 2008/06/26 06:38:51 gcosmo Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4Version.hh,v 1.17 2008/12/02 09:15:58 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030// Version information
    … …  
    5151
    5252#ifndef G4VERSION_TAG
    53 #define G4VERSION_TAG "$Name: HEAD $"
     53#define G4VERSION_TAG "$Name: geant4-09-02-cand-01 $"
    5454#endif
    5555
    … …  
    5858#include "G4String.hh"
    5959
    60 static const G4String G4Version = "$Name: HEAD $";
    61 static const G4String G4Date    = "(4-July-2008)";
     60static const G4String G4Version = "$Name: geant4-09-02-cand-01 $";
     61static const G4String G4Date    = "(19-December-2008)";
    6262
    6363#endif
Note: See TracChangeset for help on using the changeset viewer.