Taking into account primary vertex position (Yu.Belikov)

[u/mrichter/AliRoot.git] / Flugg / FGeometryInit.hh

diff --git a/Flugg/FGeometryInit.hh b/Flugg/FGeometryInit.hh
index 80993fcaf6ef4644294f8ef1c5847827db9f093c..983ea4eaecfe1356a3edd2a62dc52ff7ce23449b 100644 (file)
--- a/Flugg/FGeometryInit.hh
+++ b/Flugg/FGeometryInit.hh
@@ -66,19 +66,22 @@ public:
   inline G4int GetLttcFlagGeant();
   void SetLttcFlagGeant(G4int);
   void PrintJrLtGeant();
+  void Init();
 
   //Map access methods
   void  BuildMediaMap();
   void  SetMediumFromName(const char* volName, int med, int volid);
     //G4int GetRegionFromName(const char* volName) const;
+  int GetLastMaterialIndex() const;
   G4int GetMedium(int) const;
   int CurrentVolID(int ir, int& copyNo);
   int CurrentVolOffID(int ir, int off, int& copyNo);
-    
+  void Gmtod(double* xm, double* xd, int iflag);
+  void Gdtom(double* xd, double* xm, int iflag);    
 
 protected:
   void BuildRegionsMap();
-  void PrintRegionsMap(G4std::ostream& os);
+  void PrintRegionsMap(std::ostream& os);
   void BuildMaterialTables();
   FlukaMaterial* BuildFlukaMaterialFromElement(const G4Element* element, 
                                               G4double matDensity);
@@ -87,9 +90,9 @@ protected:
   FlukaCompound* BuildFlukaCompoundFromMaterial(const G4Material* material); 
   FlukaCompound* BuildFlukaCompoundFromElement(const G4Element* element,
                                               G4double matDensity);
-  void PrintMaterialTables(G4std::ostream& os);
-  void PrintAssignmat(G4std::ostream& os);
-  void PrintMagneticField(G4std::ostream& os);
+  void PrintMaterialTables(std::ostream& os);
+  void PrintAssignmat(std::ostream& os);
+  void PrintMagneticField(std::ostream& os);
 
 private:    
   FGeometryInit();     //costructor
@@ -110,17 +113,17 @@ private:
   G4int  fNRegions;
   int* fRegionMediumMap;
     
-  G4std::map<G4VPhysicalVolume*, int, G4std::less<G4VPhysicalVolume*> > fRegionVolumeMap;
-  G4std::map<G4VPhysicalVolume*, int, G4std::less<G4VPhysicalVolume*> > fMediumVolumeMap;
-  G4std::map<G4VPhysicalVolume*, int, G4std::less<G4VPhysicalVolume*> > fVolIdVolumeMap;
+  std::map<G4VPhysicalVolume*, int, std::less<G4VPhysicalVolume*> > fRegionVolumeMap;
+  std::map<G4VPhysicalVolume*, int, std::less<G4VPhysicalVolume*> > fMediumVolumeMap;
+  std::map<G4VPhysicalVolume*, int, std::less<G4VPhysicalVolume*> > fVolIdVolumeMap;
 
-  G4std::map<G4Material*, FlukaMaterial*, G4std::less<G4Material*> > G4FlukaMaterialMap;
-  G4std::map<G4Material*, FlukaCompound*, G4std::less<G4Material*> > G4FlukaCompoundMap;
+  std::map<G4Material*, FlukaMaterial*, std::less<G4Material*> > G4FlukaMaterialMap;
+  std::map<G4Material*, FlukaCompound*, std::less<G4Material*> > G4FlukaCompoundMap;
   //G4int NOfMaterials;
 };
 
-typedef  G4std::map<G4VPhysicalVolume*, int, G4std::less<G4VPhysicalVolume*> >::const_iterator RegionIterator;
-typedef  G4std::vector<G4Material*>::const_iterator MatTableIterator;
+typedef  std::map<G4VPhysicalVolume*, int, std::less<G4VPhysicalVolume*> >::const_iterator RegionIterator;
+typedef  std::vector<G4Material*>::const_iterator MatTableIterator;
 
 
 //Include the file with the inline methods