ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-2.0/src/applications/simpleBuilder/MoLocator.hpp
(Generate patch)

Comparing:
trunk/OOPSE-2.0/src/applications/simpleBuilder/MoLocator.hpp (file contents), Revision 1501 by tim, Tue Sep 28 23:24:25 2004 UTC vs.
branches/new_design/OOPSE-2.0/src/applications/simpleBuilder/MoLocator.hpp (file contents), Revision 1903 by tim, Thu Jan 6 00:16:07 2005 UTC

# Line 1 | Line 1
1 < #ifndef __MOLOCATOR_H__
2 < #define __MOLOCATOR_H__
1 > #ifndef __MOLOCATOR_HPP
2  
3 + #define __MOLOCATOR_HPP
4 +
5   #include <vector>
6 +
7   #include "primitives/Atom.hpp"
8   #include "primitives/DirectionalAtom.hpp"
9   #include "types/MoleculeStamp.hpp"
10   #include "primitives/Molecule.hpp"
11 < #include "Vector3d.hpp"
12 < #include "UseTheForce/ForceFields.hpp"
13 < using namespace std;
14 <
11 > #include "math/SquareMatrix3.hpp"
12 > #include "math/Vector3.hpp"
13 > #include "UseTheForce/ForceField.hpp"
14 > namespace oopse {
15   //convert lattice vector to rotation matrix
16 < void latVec2RotMat(const Vector3d& lv, double rotMat[3][3]);
17 <
16 > double getAtomMass(const std::string& at, ForceField* myFF);
17 > double getMolMass(MoleculeStamp *molStamp, ForceField *myFF);
18 > RotMat3x3d latVec2RotMat(const Vector3d& lv);
19   class MoLocator{
20 <  
21 < public:
22 <  
23 <  MoLocator( MoleculeStamp* theStamp, ForceFields* theFF);
20 >    public:
21 >        MoLocator( MoleculeStamp* theStamp, ForceField* theFF);
22 >        void placeMol( const Vector3d& offset, const Vector3d& ort, Molecule* mol);
23 >    private:
24 >        void calcRef( void );
25 >        MoleculeStamp* myStamp;
26  
27 <  void placeMol( const Vector3d& offset, const Vector3d& ort, Molecule* mol);
27 >        ForceField* myFF;
28 >        std::vector<Vector3d> refCoords;
29 >        int nIntegrableObjects;
30  
24 private:
25  
26  void calcRefCoords( void );
27  
28  MoleculeStamp* myStamp;
29  ForceFields* myFF;
30
31  vector<Vector3d> refCoords;
32  int nIntegrableObjects;
31   };
32  
33 + }
34   #endif
35 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines