Import Geant4 9.6.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-09 17:01:34 +02:00
parent b1eb5424d2
commit e2d2f9810a
10384 changed files with 698580 additions and 628834 deletions
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/G4GeoNav.hh
/// \brief Definition of the G4GeoNav class
//
// $Id: G4GeoNav.hh,v 1.4 2006-06-29 17:21:58 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/OlapDetConstr.hh
/// \brief Definition of the OlapDetConstr class
//
// $Id: OlapDetConstr.hh,v 1.2 2006-06-29 17:22:00 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/OlapEventAction.hh
/// \brief Definition of the OlapEventAction class
//
// $Id: OlapEventAction.hh,v 1.6 2010-11-16 14:34:30 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -53,11 +55,11 @@ class OlapInfo
{
public:
OlapInfo(G4NavigationHistory & h1,
G4NavigationHistory & h2,
G4ThreeVector & p1,
G4ThreeVector & p2,
G4int a=0,
G4LogicalVolume* original=0)
G4NavigationHistory & h2,
G4ThreeVector & p1,
G4ThreeVector & p2,
G4int a=0,
G4LogicalVolume* original=0)
: hist1(h1), hist2(h2), v1(p1), v2(p2),axis(a),
info(""), probNot(false), originalMother(original) {}
@@ -72,17 +74,14 @@ public:
std::vector<OlapStepInfo *> stAB;
std::vector<OlapStepInfo *> stBA;
G4String info;
G4bool probNot ;
G4bool probNot ;
G4LogicalVolume* originalMother;
};
std::ostream &
operator<<(std::ostream& flux, OlapInfo & oi);
std::ostream & operator<<(std::ostream& flux, OlapInfo & oi);
// ------------==============-------------==============----------------
class OlapEventAction : public G4UserEventAction
{
public:
@@ -101,4 +100,5 @@ public:
std::vector<OlapStepInfo*> BASteps;
G4bool dontDelete;
};
#endif
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/OlapGenerator.hh
/// \brief Definition of the OlapGenerator class
//
// $Id: OlapGenerator.hh,v 1.3 2006-06-29 17:22:04 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/OlapLogManager.hh
/// \brief Definition of the OlapLogManager class
//
// $Id: OlapLogManager.hh,v 1.2 2006-06-29 17:22:06 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/OlapManager.hh
/// \brief Definition of the OlapManager class
//
// $Id: OlapManager.hh,v 1.5 2010-10-27 10:25:26 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/OlapManagerMessenger.hh
/// \brief Definition of the OlapManagerMessenger class
//
// $Id: OlapManagerMessenger.hh,v 1.2 2006-06-29 17:22:10 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/OlapNotify.hh
/// \brief Definition of the OlapNotify class
//
// $Id: OlapNotify.hh,v 1.3 2006-06-29 17:22:13 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -56,6 +58,6 @@ public:
virtual void worldChanged(G4LogicalVolume* newWorld) = 0;
virtual void overlaps(const std::vector<OlapInfo*> &)=0;
};
};
#endif
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/OlapPhysicsList.hh
/// \brief Definition of the OlapPhysicsList class
//
// $Id: OlapPhysicsList.hh,v 1.2 2006-06-29 17:22:35 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/OlapRunAction.hh
/// \brief Definition of the OlapRunAction class
//
// $Id: OlapRunAction.hh,v 1.3 2006-06-29 17:22:38 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/OlapSteppingAction.hh
/// \brief Definition of the OlapSteppingAction class
//
// $Id: OlapSteppingAction.hh,v 1.3 2006-06-29 17:22:41 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/RandomDetector.hh
/// \brief Definition of the RandomDetector class
//
// $Id: RandomDetector.hh,v 1.2 2006-06-29 17:22:44 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -56,4 +58,4 @@ private:
G4double worldDim_;
};
#endif
#endif
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/SolidAnalyser.hh
/// \brief Definition of the SolidAnalyser class
//
// $Id: SolidAnalyser.hh,v 1.3 2006-06-29 17:22:46 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
+27 -25
View File
@@ -23,9 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file geometry/olap/include/tree.hh
/// \brief Definition of the tree class
//
// $Id: tree.hh,v 1.4 2006-06-29 17:22:48 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id$
//
//
// --------------------------------------------------------------
@@ -58,23 +60,23 @@ class TreeNode
public:
TreeNode(TreeNode * parent, Data data)
: parent_(parent), firstChild_(0),
lastChild_(0), nextSibling_(0), data_(data)
TreeNode(TreeNode * prt, Data dta)
: parent_(prt), firstChild_(0),
lastChild_(0), nextSibling_(0), data_(dta)
{
if (parent)
if (prt)
{
if(!parent->firstChild_)
if(!prt->firstChild_)
{
parent->firstChild_=this;
parent->lastChild_=this;
}
else
prt->firstChild_=this;
prt->lastChild_=this;
}
else
{
parent->lastChild_->nextSibling_ = this;
parent->lastChild_=this;
}
}
prt->lastChild_->nextSibling_ = this;
prt->lastChild_=this;
}
}
}
~TreeNode() // deletes the whole subtree as well!
@@ -82,12 +84,12 @@ public:
if (parent_)
{
TreeNode * i = parent_->firstChild_;
while(*i)
while(*i)
{
TreeNode * temp = i;
i = i->nextSibling_;
delete temp;
}
TreeNode * temp = i;
i = i->nextSibling_;
delete temp;
}
}
}
@@ -117,8 +119,8 @@ protected:
Data data_;
private:
TreeNode(const TreeNode &);
TreeNode & operator=(const TreeNode *);
TreeNode(const TreeNode &);
TreeNode & operator=(const TreeNode *);
};
@@ -174,10 +176,10 @@ public:
if (curpos_->nextSibling_)
{
curpos_ = curpos_->nextSibling_;
return curpos_;
}
return curpos_;
}
}
return 0;
return 0;
}
protected: