 |
 |
| Commit in lcdd on MAIN | |||
| include/lcdd/bfield/FieldManager.hh | +4 | -1 | 1.4 -> 1.5 |
| /MagneticFieldOverlay.hh | +8 | -1 | 1.5 -> 1.6 |
| include/lcdd/core/GeometryManager.hh | +2 | -2 | 1.3 -> 1.4 |
| /LCDDDetectorConstruction.hh | +9 | -9 | 1.3 -> 1.4 |
| /LCDDMessenger.hh | +9 | -9 | 1.4 -> 1.5 |
| /LCDDObjectStoreInspector.hh | +33 | -32 | 1.4 -> 1.5 |
| /LCDDParser.hh | +11 | -11 | 1.4 -> 1.5 |
| /LCDDProcessor.hh | +8 | -8 | 1.4 -> 1.5 |
| include/lcdd/detectors/CalorimeterHitProcessor.hh | +2 | -2 | 1.5 -> 1.6 |
| /CalorimeterSD.hh | +7 | -7 | 1.3 -> 1.4 |
| /CellReadout.hh | +2 | -2 | 1.5 -> 1.6 |
| /CellReadout2D.hh | +3 | -3 | 1.5 -> 1.6 |
| /CellReadout2DSegmentation.hh | +1 | -1 | 1.4 -> 1.5 |
| /Cerenkov.hh | +4 | -4 | 1.4 -> 1.5 |
| /Segmentation.hh | +5 | -5 | 1.5 -> 1.6 |
| /SensitiveDetector.hh | +23 | -23 | 1.2 -> 1.3 |
| /SensitiveDetectorMessenger.hh | +12 | -12 | 1.4 -> 1.5 |
| /TrackerCombineSD.hh | +12 | -12 | 1.2 -> 1.3 |
| /TrackerSD.hh | +3 | -3 | 1.2 -> 1.3 |
| include/lcdd/hits/CalorimeterHit.hh | +18 | -18 | 1.3 -> 1.4 |
| /HitContribution.hh | +14 | -14 | 1.2 -> 1.3 |
| /TrackInformation.hh | +22 | -22 | 1.5 -> 1.6 |
| /TrackerHit.hh | +25 | -25 | 1.2 -> 1.3 |
| include/lcdd/id/Id64bit.hh | +9 | -9 | 1.2 -> 1.3 |
| /IdManager.hh | +8 | -8 | 1.2 -> 1.3 |
| include/lcdd/schema/AuthorType.hh | +7 | -7 | 1.3 -> 1.4 |
| /CalorimeterType.hh | +7 | -7 | 1.3 -> 1.4 |
| /CellReadout2DSegmentationType.hh | +10 | -10 | 1.4 -> 1.5 |
| /ColorType.hh | +13 | -13 | 1.3 -> 1.4 |
| /CommentType.hh | +4 | -4 | 1.3 -> 1.4 |
| /DetectorType.hh | +10 | -10 | 1.3 -> 1.4 |
| /DipoleCoeffType.hh | +4 | -4 | 1.3 -> 1.4 |
| /DipoleType.hh | +13 | -13 | 1.3 -> 1.4 |
| /FieldMapType.hh | +4 | -4 | 1.3 -> 1.4 |
| /GeneratorType.hh | +13 | -13 | 1.3 -> 1.4 |
| /GlobalFieldType.hh | +4 | -4 | 1.3 -> 1.4 |
| /GlobalGridXYSegmentationType.hh | +10 | -10 | 1.3 -> 1.4 |
| /HeaderType.hh | +4 | -4 | 1.3 -> 1.4 |
| /IdFieldType.hh | +13 | -13 | 1.3 -> 1.4 |
| /IdSpecType.hh | +10 | -10 | 1.3 -> 1.4 |
| /LimitParamType.hh | +13 | -13 | 1.3 -> 1.4 |
| /LimitSetType.hh | +7 | -7 | 1.3 -> 1.4 |
| /LimitType.hh | +29 | -29 | 1.3 -> 1.4 |
| /NonprojectiveCylinderSegmentationType.hh | +10 | -10 | 1.3 -> 1.4 |
| /NonprojectiveSegmentationType.hh | +13 | -13 | 1.3 -> 1.4 |
| /PhysVolIdType.hh | +7 | -7 | 1.3 -> 1.4 |
| /ProjectiveCylinderSegmentationType.hh | +6 | -6 | 1.3 -> 1.4 |
| /ProjectiveZPlaneSegmentationType.hh | +6 | -6 | 1.3 -> 1.4 |
| /RZBType.hh | +13 | -13 | 1.3 -> 1.4 |
| /RZFieldMapType.hh | +13 | -13 | 1.3 -> 1.4 |
| /RegionType.hh | +25 | -25 | 1.3 -> 1.4 |
| /SensitiveDetectorType.hh | +25 | -25 | 1.3 -> 1.4 |
| /TrackerType.hh | +4 | -4 | 1.3 -> 1.4 |
| /VisType.hh | +19 | -19 | 1.3 -> 1.4 |
| src/lcdd/core/LCDDDetectorConstruction.cc | +10 | -10 | 1.1 -> 1.2 |
| /LCDDMessenger.cc | +42 | -42 | 1.2 -> 1.3 |
| /LCDDParser.cc | +30 | -30 | 1.3 -> 1.4 |
| /LCDDProcessor.cc | +37 | -37 | 1.2 -> 1.3 |
| src/lcdd/detectors/CalorimeterSD.cc | +39 | -39 | 1.3 -> 1.4 |
| /CellReadout.cc | +2 | -2 | 1.1 -> 1.2 |
| /CellReadout2D.cc | +11 | -11 | 1.1 -> 1.2 |
| /CellReadout2DSegmentation.cc | +4 | -4 | 1.2 -> 1.3 |
| /Cerenkov.cc | +12 | -12 | 1.1 -> 1.2 |
| /OpticalCalorimeterSD.cc | +5 | -5 | 1.2 -> 1.3 |
| /ScorerSD.cc | +2 | -2 | 1.2 -> 1.3 |
| /Segmentation.cc | +15 | -15 | 1.3 -> 1.4 |
| /SensitiveDetector.cc | +19 | -19 | 1.1 -> 1.2 |
| /SensitiveDetectorMessenger.cc | +48 | -48 | 1.2 -> 1.3 |
| /TrackerCombineSD.cc | +42 | -42 | 1.1 -> 1.2 |
| /TrackerSD.cc | +12 | -12 | 1.1 -> 1.2 |
| /UnsegmentedCalorimeterSD.cc | +3 | -3 | 1.2 -> 1.3 |
| src/lcdd/hits/CalorimeterHit.cc | +10 | -10 | 1.2 -> 1.3 |
| /HitContribution.cc | +12 | -12 | 1.1 -> 1.2 |
| /TrackInformation.cc | +12 | -12 | 1.1 -> 1.2 |
| /TrackerHit.cc | +2 | -2 | 1.1 -> 1.2 |
| src/lcdd/id/IdManager.cc | +10 | -10 | 1.1 -> 1.2 |
| +949 | -938 | ||
rename some private variables
diff -u -r1.4 -r1.5 --- FieldManager.hh 2 Jul 2013 21:19:43 -0000 1.4 +++ FieldManager.hh 10 Jul 2013 16:49:45 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/bfield/FieldManager.hh,v 1.4 2013/07/02 21:19:43 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/bfield/FieldManager.hh,v 1.5 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_BFIELD_FIELDMANAGER_HH #define LCDD_BFIELD_FIELDMANAGER_HH 1
@@ -70,6 +70,9 @@
private:
+ /** + * Class constructor, which is private. + */
FieldManager(); private:
diff -u -r1.5 -r1.6 --- MagneticFieldOverlay.hh 2 Jul 2013 21:19:43 -0000 1.5 +++ MagneticFieldOverlay.hh 10 Jul 2013 16:49:45 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/bfield/MagneticFieldOverlay.hh,v 1.5 2013/07/02 21:19:43 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/bfield/MagneticFieldOverlay.hh,v 1.6 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_BFIELD_MAGNETICFIELDOVERLAY_HH #define LCDD_BFIELD_MAGNETICFIELDOVERLAY_HH 1
@@ -15,7 +15,14 @@
{
public:
+ /** + * Class constructor. + */
MagneticFieldOverlay();
+ + /** + * Class destructor. + */
virtual ~MagneticFieldOverlay(); public:
diff -u -r1.3 -r1.4 --- GeometryManager.hh 2 Jul 2013 21:19:43 -0000 1.3 +++ GeometryManager.hh 10 Jul 2013 16:49:45 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/GeometryManager.hh,v 1.3 2013/07/02 21:19:43 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/core/GeometryManager.hh,v 1.4 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_GEOMETRYMANAGER_HH #define LCDD_GEOMETRYMANAGER_HH 1
@@ -9,7 +9,7 @@
class G4String; /**
- * Singleton manager class with miscellaneous geometry utility and management functions.
+ * Singleton geometry manager class with miscellaneous utility and management functions.
*/
class GeometryManager
{
diff -u -r1.3 -r1.4 --- LCDDDetectorConstruction.hh 2 Jul 2013 21:19:43 -0000 1.3 +++ LCDDDetectorConstruction.hh 10 Jul 2013 16:49:45 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDDetectorConstruction.hh,v 1.3 2013/07/02 21:19:43 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDDetectorConstruction.hh,v 1.4 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_CORE_LCDDDETECTORCONSTRUCTION_HH #define LCDD_CORE_LCDDDETECTORCONSTRUCTION_HH 1
@@ -53,14 +53,14 @@
private:
- G4UImessenger* m_messenger; - G4UImessenger* m_writerMessenger; - G4VPhysicalVolume* m_world; - LCDDObjectStoreInspector* m_inspector; - - std::string m_URI; - std::string m_setupName; - std::string m_version;
+ G4UImessenger* _messenger; + G4UImessenger* _writerMessenger; + G4VPhysicalVolume* _world; + LCDDObjectStoreInspector* _inspector; + + std::string _URI; + std::string _setupName; + std::string _version;
}; #endif
diff -u -r1.4 -r1.5 --- LCDDMessenger.hh 2 Jul 2013 21:19:43 -0000 1.4 +++ LCDDMessenger.hh 10 Jul 2013 16:49:45 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDMessenger.hh,v 1.4 2013/07/02 21:19:43 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDMessenger.hh,v 1.5 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_CORE_LCDDMESSENGER_HH #define LCDD_CORE_LCDDMESSENGER_HH 1
@@ -53,14 +53,14 @@
private:
- G4UIdirectory* m_lcddDir; - G4UIcommand* m_setupCmd; - G4UIcommand* m_setURICmd; - G4UIcommand* m_setSetupNameCmd; - G4UIcommand* m_setVersionCmd; - G4UIcommand* m_dumpCmd; - G4UIcommand* m_checkOverlapsCmd; - G4UIcommand* m_checkOverlapsRecurseCmd;
+ G4UIdirectory* _lcddDir; + G4UIcommand* _setupCmd; + G4UIcommand* _setURICmd; + G4UIcommand* _setSetupNameCmd; + G4UIcommand* _setVersionCmd; + G4UIcommand* _dumpCmd; + G4UIcommand* _checkOverlapsCmd; + G4UIcommand* _checkOverlapsRecurseCmd;
}; // class #endif
diff -u -r1.4 -r1.5 --- LCDDObjectStoreInspector.hh 2 Jul 2013 21:19:43 -0000 1.4 +++ LCDDObjectStoreInspector.hh 10 Jul 2013 16:49:45 -0000 1.5 @@ -1,4 +1,4 @@
-// $Id: LCDDObjectStoreInspector.hh,v 1.4 2013/07/02 21:19:43 jeremy Exp $
+// $Id: LCDDObjectStoreInspector.hh,v 1.5 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_CORE_LCDDOBJECTSTOREINSPECTOR_HH #define LCDD_CORE_LCDDOBJECTSTOREINSPECTOR_HH 1
@@ -8,7 +8,8 @@
#include "lcdd/core/LCDDProcessor.hh" /**
- * Creates specific instances of the StoreInspector for looking at information in Geant4 and LCDD object stores.
+ * Creates specific instances of the StoreInspector for looking at information + * in Geant4 and LCDD object stores.
*/
class LCDDObjectStoreInspector
{
@@ -21,16 +22,16 @@
*/
LCDDObjectStoreInspector()
{
- m_materialInspector = new G4MaterialStoreInspector("G4Material", G4Material::GetMaterialTable());
- m_solidInspector = new G4SolidStoreInspector("G4VSolid", G4SolidStore::GetInstance());
- m_limitsetInspector = new G4LimitSetInspector("G4LimitSet", LCDDProcessor::instance()->getLimitSetStore());
- m_lvolumeInspector = new G4LogicalVolumeStoreInspector("G4LogicalVolume", G4LogicalVolumeStore::GetInstance());
- m_pvolumeInspector = new G4PhysicalVolumeStoreInspector("G4VPhysicalVolume", G4PhysicalVolumeStore::GetInstance());
- m_idspecInspector = new IdSpecInspector("IdSpec", IdManager::instance()->getIdSpecStore());
- m_sdInspector = new G4SensitiveDetectorInspector("G4SensitiveDetector", LCDDProcessor::instance()->getSensitiveDetectorStore());
- m_regionInspector = new G4RegionStoreInspector("G4Region", G4RegionStore::GetInstance());
- m_fieldInspector = new G4MagneticFieldInspector("G4MagneticField", LCDDProcessor::instance()->getMagneticFieldStore());
- m_visInspector = new G4VisAttributeInspector("G4VisAttributes", LCDDProcessor::instance()->getVisAttributesStore());
+ _materialInspector = new G4MaterialStoreInspector("G4Material", G4Material::GetMaterialTable());
+ _solidInspector = new G4SolidStoreInspector("G4VSolid", G4SolidStore::GetInstance());
+ _limitsetInspector = new G4LimitSetInspector("G4LimitSet", LCDDProcessor::instance()->getLimitSetStore());
+ _lvolumeInspector = new G4LogicalVolumeStoreInspector("G4LogicalVolume", G4LogicalVolumeStore::GetInstance());
+ _pvolumeInspector = new G4PhysicalVolumeStoreInspector("G4VPhysicalVolume", G4PhysicalVolumeStore::GetInstance());
+ _idspecInspector = new IdSpecInspector("IdSpec", IdManager::instance()->getIdSpecStore());
+ _sdInspector = new G4SensitiveDetectorInspector("G4SensitiveDetector", LCDDProcessor::instance()->getSensitiveDetectorStore());
+ _regionInspector = new G4RegionStoreInspector("G4Region", G4RegionStore::GetInstance());
+ _fieldInspector = new G4MagneticFieldInspector("G4MagneticField", LCDDProcessor::instance()->getMagneticFieldStore());
+ _visInspector = new G4VisAttributeInspector("G4VisAttributes", LCDDProcessor::instance()->getVisAttributesStore());
}
/**
@@ -38,30 +39,30 @@
*/
virtual ~LCDDObjectStoreInspector()
{
- delete m_materialInspector; - delete m_solidInspector; - delete m_limitsetInspector; - delete m_lvolumeInspector; - delete m_pvolumeInspector; - delete m_idspecInspector; - delete m_sdInspector; - delete m_regionInspector; - delete m_fieldInspector; - delete m_visInspector;
+ delete _materialInspector; + delete _solidInspector; + delete _limitsetInspector; + delete _lvolumeInspector; + delete _pvolumeInspector; + delete _idspecInspector; + delete _sdInspector; + delete _regionInspector; + delete _fieldInspector; + delete _visInspector;
} private:
- G4MaterialStoreInspector* m_materialInspector; - G4SolidStoreInspector* m_solidInspector; - G4LimitSetInspector* m_limitsetInspector; - G4LogicalVolumeStoreInspector* m_lvolumeInspector; - G4PhysicalVolumeStoreInspector* m_pvolumeInspector; - IdSpecInspector* m_idspecInspector; - G4SensitiveDetectorInspector* m_sdInspector; - G4RegionStoreInspector* m_regionInspector; - G4MagneticFieldInspector* m_fieldInspector; - G4VisAttributeInspector* m_visInspector;
+ G4MaterialStoreInspector* _materialInspector; + G4SolidStoreInspector* _solidInspector; + G4LimitSetInspector* _limitsetInspector; + G4LogicalVolumeStoreInspector* _lvolumeInspector; + G4PhysicalVolumeStoreInspector* _pvolumeInspector; + IdSpecInspector* _idspecInspector; + G4SensitiveDetectorInspector* _sdInspector; + G4RegionStoreInspector* _regionInspector; + G4MagneticFieldInspector* _fieldInspector; + G4VisAttributeInspector* _visInspector;
}; #endif
diff -u -r1.4 -r1.5 --- LCDDParser.hh 2 Jul 2013 21:19:43 -0000 1.4 +++ LCDDParser.hh 10 Jul 2013 16:49:45 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDParser.hh,v 1.4 2013/07/02 21:19:43 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDParser.hh,v 1.5 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_CORE_LCDDPARSER_HH #define LCDD_CORE_LCDDPARSER_HH 1
@@ -126,20 +126,20 @@
private:
- SAXProcessor m_sxp; - ProcessingConfigurator m_config;
+ SAXProcessor _sxp; + ProcessingConfigurator _config;
- std::string m_URI; - std::string m_setupName; - std::string m_version;
+ std::string _URI; + std::string _setupName; + std::string _version;
- bool m_initialized; - bool m_constructed; - bool m_setURI;
+ bool _initialized; + bool _constructed; + bool _setURI;
- G4VPhysicalVolume* m_world;
+ G4VPhysicalVolume* _world;
- static LCDDParser* m_instance;
+ static LCDDParser* _instance;
}; // class
diff -u -r1.4 -r1.5 --- LCDDProcessor.hh 2 Jul 2013 21:19:43 -0000 1.4 +++ LCDDProcessor.hh 10 Jul 2013 16:49:45 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDProcessor.hh,v 1.4 2013/07/02 21:19:43 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/core/LCDDProcessor.hh,v 1.5 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_CORE_LCDDPROCESSOR_HH #define LCDD_CORE_LCDDPROCESSOR_HH 1
@@ -279,17 +279,17 @@
private:
// header info for the lcdd file
- LCDDHeaderRecord* m_header;
+ LCDDHeaderRecord* _header;
// vectors of SD, mag, regions, visAttributes
- LCDDProcessor::SensitiveDetectors m_sensitiveDetectors; - LCDDProcessor::MagneticFields m_magneticFields; - LCDDProcessor::Regions m_regions; - LCDDProcessor::VisAttributes m_visAttributes; - LCDDProcessor::LimitSets m_limitSets;
+ LCDDProcessor::SensitiveDetectors _sensitiveDetectors; + LCDDProcessor::MagneticFields _magneticFields; + LCDDProcessor::Regions _regions; + LCDDProcessor::VisAttributes _visAttributes; + LCDDProcessor::LimitSets _limitSets;
// static singleton instance var
- static LCDDProcessor* sInstance;
+ static LCDDProcessor* _instance;
}; #endif
diff -u -r1.5 -r1.6 --- CalorimeterHitProcessor.hh 2 Jul 2013 22:57:42 -0000 1.5 +++ CalorimeterHitProcessor.hh 10 Jul 2013 16:49:45 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/CalorimeterHitProcessor.hh,v 1.5 2013/07/02 22:57:42 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/CalorimeterHitProcessor.hh,v 1.6 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_DETECTORS_CALORIMETERHITPROCESSOR_HH #define LCDD_DETECTORS_CALORIMETERHITPROCESSOR_HH 1
@@ -38,7 +38,7 @@
bool processHits(G4Step* aStep); private:
- CellReadout* m_readout;
+ CellReadout* _readout;
}; #endif
diff -u -r1.3 -r1.4 --- CalorimeterSD.hh 2 Jul 2013 22:57:42 -0000 1.3 +++ CalorimeterSD.hh 10 Jul 2013 16:49:45 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/CalorimeterSD.hh,v 1.3 2013/07/02 22:57:42 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/CalorimeterSD.hh,v 1.4 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_DETECTORS_CALORIMETERSD_HH #define LCDD_DETECTORS_CALORIMETERSD_HH 1
@@ -145,12 +145,12 @@
virtual G4bool ProcessHits(G4Step* step, G4TouchableHistory* touchable); protected:
- Segmentation* m_segmentation; - G4CalorimeterHitsCollection* m_collection; - std::vector<G4CalorimeterHitsCollection*> m_hitsCollections; - CalorimeterHitList m_hits; - std::vector<CalorimeterHitList> hits_vector; - HitComparator* m_hitCompare;
+ Segmentation* _segmentation; + G4CalorimeterHitsCollection* _collection; + std::vector<G4CalorimeterHitsCollection*> _hitsCollections; + CalorimeterHitList _hits; + std::vector<CalorimeterHitList> _hitsVector; + HitComparator* _hitCompare;
}; #endif
diff -u -r1.5 -r1.6 --- CellReadout.hh 3 Jul 2013 23:00:45 -0000 1.5 +++ CellReadout.hh 10 Jul 2013 16:49:45 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/CellReadout.hh,v 1.5 2013/07/03 23:00:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/CellReadout.hh,v 1.6 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_DETECTORS_CELLREADOUT_HH #define LCDD_DETECTORS_CELLREADOUT_HH 1
@@ -71,7 +71,7 @@
protected:
/** The list of field names. */
- FieldNames m_fieldNames;
+ FieldNames _fieldNames;
}; #endif
diff -u -r1.5 -r1.6 --- CellReadout2D.hh 3 Jul 2013 23:00:45 -0000 1.5 +++ CellReadout2D.hh 10 Jul 2013 16:49:45 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/CellReadout2D.hh,v 1.5 2013/07/03 23:00:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/CellReadout2D.hh,v 1.6 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_DETECTORS_CELLREADOUT2D_HH #define LCDD_DETECTORS_CELLREADOUT2D_HH 1
@@ -120,8 +120,8 @@
private:
- double m_cellSizeX; - double m_cellSizeY;
+ double _cellSizeX; + double _cellSizeY;
}; #endif
diff -u -r1.4 -r1.5 --- CellReadout2DSegmentation.hh 2 Jul 2013 22:57:42 -0000 1.4 +++ CellReadout2DSegmentation.hh 10 Jul 2013 16:49:45 -0000 1.5 @@ -63,7 +63,7 @@
private:
- CellReadout2D* m_readout;
+ CellReadout2D* _readout;
}; #endif
diff -u -r1.4 -r1.5 --- Cerenkov.hh 2 Jul 2013 22:57:42 -0000 1.4 +++ Cerenkov.hh 10 Jul 2013 16:49:45 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/Cerenkov.hh,v 1.4 2013/07/02 22:57:42 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/Cerenkov.hh,v 1.5 2013/07/10 16:49:45 jeremy Exp $
/* ------------------------------------------------------------------------ |\___/|
@@ -59,9 +59,9 @@
G4double GetAverageNumberOfPhotons(const G4double charge, const G4double beta, const G4String material) const; private:
- std::vector<G4String> CAI; - std::vector<G4PhysicsOrderedFreeVector*> CerenkovAngleIntegrals; - std::vector<G4MaterialPropertyVector*> RefractionIndeces;
+ std::vector<G4String> _CAI; + std::vector<G4PhysicsOrderedFreeVector*> _cerenkovAngleIntegrals; + std::vector<G4MaterialPropertyVector*> _refractionIndeces;
}; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff -u -r1.5 -r1.6 --- Segmentation.hh 9 Jul 2013 18:51:54 -0000 1.5 +++ Segmentation.hh 10 Jul 2013 16:49:45 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/Segmentation.hh,v 1.5 2013/07/09 18:51:54 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/Segmentation.hh,v 1.6 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_DETECTORS_SEGMENTATION_HH #define LCDD_DETECTORS_SEGMENTATION_HH 1
@@ -176,16 +176,16 @@
private:
/** The current bin values. */
- std::vector<int> m_bins;
+ std::vector<int> _bins;
/** The list of bin names. */
- BinNames m_binNames;
+ BinNames _binNames;
/** The number of bins. */
- int m_numBins;
+ int _numBins;
/** The type of Segmentation. */
- EType m_type;
+ EType _type;
}; #endif
diff -u -r1.2 -r1.3 --- SensitiveDetector.hh 3 Jul 2013 20:03:49 -0000 1.2 +++ SensitiveDetector.hh 10 Jul 2013 16:49:45 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/SensitiveDetector.hh,v 1.2 2013/07/03 20:03:49 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/SensitiveDetector.hh,v 1.3 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_DETECTORS_SENSITIVEDETECTOR_HH #define LCDD_DETECTORS_SENSITIVEDETECTOR_HH 1
@@ -69,7 +69,7 @@
* Return the type of this detector encoded as an int.
*/
inline SensitiveDetector::EType getType() const {
- return m_type;
+ return _type;
} /**
@@ -81,7 +81,7 @@
* Return the hits collection ID associated with this detector.
*/
inline G4int getHCID() const {
- return m_hcids[0];
+ return _hcids[0];
} /**
@@ -95,7 +95,7 @@
<< this->GetName() << "." << G4endl;
G4Exception("", "", FatalException, "Invalid index.");
}
- return m_hcids[nHC];
+ return _hcids[nHC];
} /**
@@ -133,7 +133,7 @@
*/
inline void setVerbose(unsigned int v)
{
- m_verbose = v;
+ _verbose = v;
} /**
@@ -142,7 +142,7 @@
*/
inline unsigned int getVerbose() const
{
- return m_verbose;
+ return _verbose;
} /**
@@ -151,7 +151,7 @@
*/
inline G4double getEcut()
{
- return m_ecut;
+ return _ecut;
} /**
@@ -160,7 +160,7 @@
*/
inline void setEcut(G4double ecut)
{
- m_ecut = ecut;
+ _ecut = ecut;
} /**
@@ -169,7 +169,7 @@
*/
inline void setIdSpec(IdSpec* idspec)
{
- m_idspec = idspec;
+ _idspec = idspec;
} /**
@@ -178,7 +178,7 @@
*/
inline IdSpec* getIdSpec() const
{
- return m_idspec;
+ return _idspec;
} /**
@@ -187,7 +187,7 @@
*/
inline bool hasIdSpec() const
{
- return m_idspec != 0;
+ return _idspec != 0;
} /**
@@ -202,7 +202,7 @@
*/
inline void setEndcapFlag(bool ec = true)
{
- m_endcap = ec;
+ _endcap = ec;
} /**
@@ -211,7 +211,7 @@
*/
inline bool getEndcapFlag()
{
- return m_endcap;
+ return _endcap;
} /**
@@ -270,7 +270,7 @@
*/
inline int getNumberOfHitsCollections() const
{
- return m_hcids.size();
+ return _hcids.size();
}
/**
@@ -307,7 +307,7 @@
*/
inline void setHCID(G4int hcid)
{
- m_hcids[0] = hcid;
+ _hcids[0] = hcid;
}
/**
@@ -322,33 +322,33 @@
G4cerr << this->GetName() << "setHCID Nr of HC"<< nHC << "not valid"<< G4endl;
G4Exception("", "", FatalException, "Bad HC index.");
}
- m_hcids[nHC] = hcid;
+ _hcids[nHC] = hcid;
}
protected:
// vector containing Hit Collection ID's
- std::vector<G4int> m_hcids;
+ std::vector<G4int> _hcids;
// verbosity
- unsigned int m_verbose;
+ unsigned int _verbose;
// endcap flag for LCIO's CHBIT_BARREL bit
- bool m_endcap;
+ bool _endcap;
// energy cut
- double m_ecut;
+ double _ecut;
// identifier field description
- IdSpec* m_idspec;
+ IdSpec* _idspec;
private:
// type = calorimeter or tracker
- EType m_type;
+ EType _type;
// The Geant4 command messenger associated with this detector.
- G4UImessenger* m_messenger;
+ G4UImessenger* _messenger;
}; #endif
diff -u -r1.4 -r1.5 --- SensitiveDetectorMessenger.hh 3 Jul 2013 20:03:49 -0000 1.4 +++ SensitiveDetectorMessenger.hh 10 Jul 2013 16:49:45 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/SensitiveDetectorMessenger.hh,v 1.4 2013/07/03 20:03:49 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/SensitiveDetectorMessenger.hh,v 1.5 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_DETECTORS_SENSITIVEDETECTORMESSENGER_HH #define LCDD_DETECTORS_SENSITIVEDETECTORMESSENGER_HH 1
@@ -60,18 +60,18 @@
private:
- SensitiveDetector* m_detector;
+ SensitiveDetector* _detector;
- static G4UIdirectory* m_detectorsDir; - G4UIdirectory* m_detectorDir; - G4UIcommand* m_printInfoCmd; - G4UIcommand* m_printHitsCmd; - G4UIcommand* m_printVolumesCmd; - G4UIcommand* m_printTotalEdepCmd; - G4UIcommand* m_printNHitsCmd; - G4UIcmdWithAnInteger* m_verboseCmd; - G4UIcmdWithABool* m_activateCmd; - G4UIcmdWithADoubleAndUnit* m_ecutCmd;
+ static G4UIdirectory* _detectorsDir; + G4UIdirectory* _detectorDir; + G4UIcommand* _printInfoCmd; + G4UIcommand* _printHitsCmd; + G4UIcommand* _printVolumesCmd; + G4UIcommand* _printTotalEdepCmd; + G4UIcommand* _printNHitsCmd; + G4UIcmdWithAnInteger* _verboseCmd; + G4UIcmdWithABool* _activateCmd; + G4UIcmdWithADoubleAndUnit* _ecutCmd;
}; #endif
diff -u -r1.2 -r1.3 --- TrackerCombineSD.hh 3 Jul 2013 20:03:49 -0000 1.2 +++ TrackerCombineSD.hh 10 Jul 2013 16:49:45 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/TrackerCombineSD.hh,v 1.2 2013/07/03 20:03:49 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/TrackerCombineSD.hh,v 1.3 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_DETECTORS_TRACKERCOMBINESD_HH #define LCDD_DETECTORS_TRACKERCOMBINESD_HH 1
@@ -67,17 +67,17 @@
private:
- bool m_combineHits; - int m_currentTrackID; - G4VPhysicalVolume* m_currentPV; - G4ThreeVector m_entryPoint; - G4ThreeVector m_exitPoint; - G4ThreeVector m_entryMomentum; - G4ThreeVector m_exitMomentum; - G4double m_edepTotal; - G4double m_minTime; - bool m_startedHit; - G4Track* m_currentTrack;
+ bool _combineHits; + int _currentTrackID; + G4VPhysicalVolume* _currentPV; + G4ThreeVector _entryPoint; + G4ThreeVector _exitPoint; + G4ThreeVector _entryMomentum; + G4ThreeVector _exitMomentum; + G4double _edepTotal; + G4double _minTime; + bool _startedHit; + G4Track* _currentTrack;
}; #endif
diff -u -r1.2 -r1.3 --- TrackerSD.hh 3 Jul 2013 20:03:49 -0000 1.2 +++ TrackerSD.hh 10 Jul 2013 16:49:45 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/TrackerSD.hh,v 1.2 2013/07/03 20:03:49 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/TrackerSD.hh,v 1.3 2013/07/10 16:49:45 jeremy Exp $
#ifndef LCDD_DETECTORS_TRACKERSD_HH #define LCDD_DETECTORS_TRACKERSD_HH 1
@@ -78,8 +78,8 @@
virtual G4bool ProcessHits(G4Step* step, G4TouchableHistory* touchable); protected:
- G4TrackerHitsCollection* m_HC; - G4TrackerHitList m_hits;
+ G4TrackerHitsCollection* _HC; + G4TrackerHitList _hits;
}; #endif
diff -u -r1.3 -r1.4 --- CalorimeterHit.hh 3 Jul 2013 23:53:08 -0000 1.3 +++ CalorimeterHit.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/CalorimeterHit.hh,v 1.3 2013/07/03 23:53:08 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/hits/CalorimeterHit.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_HITS_CALORIMETERHIT_HH #define LCDD_HITS_CALORIMETERHIT_HH 1
@@ -104,7 +104,7 @@
*/
void setPos(const G4ThreeVector& posXYZ)
{
- m_pos = posXYZ;
+ _pos = posXYZ;
}
/**
@@ -113,7 +113,7 @@
*/
void setEdep(const G4double ed)
{
- m_edep = ed;
+ _edep = ed;
}
/**
@@ -122,7 +122,7 @@
*/
void incrEdep(const G4double edincr)
{
- m_edep += edincr;
+ _edep += edincr;
}
/**
@@ -131,7 +131,7 @@
*/
G4ThreeVector getPos() const
{
- return m_pos;
+ return _pos;
}
/**
@@ -140,7 +140,7 @@
*/
G4double getEdep() const
{
- return m_edep;
+ return _edep;
}
/**
@@ -149,7 +149,7 @@
*/
void addHitContribution(HitContribution contrib)
{
- m_particleList.push_back(contrib);
+ _particleList.push_back(contrib);
}
/**
@@ -158,7 +158,7 @@
*/
const HitContributionList& getHitContributions() const
{
- return m_particleList;
+ return _particleList;
}
/**
@@ -168,8 +168,8 @@
*/
void setId64bit(Id64bit::ElementType id0, Id64bit::ElementType id1)
{
- m_id64.setId0(id0); - m_id64.setId1(id1);
+ _id64.setId0(id0); + _id64.setId1(id1);
}
/**
@@ -178,7 +178,7 @@
*/
const Id64bit& getId64bit() const
{
- return m_id64;
+ return _id64;
}
/**
@@ -187,7 +187,7 @@
*/
void setEndcapFlag(bool ec = true)
{
- m_endcap = ec;
+ _endcap = ec;
}
/**
@@ -196,25 +196,25 @@
*/
bool getEndcapFlag()
{
- return m_endcap;
+ return _endcap;
}
private:
// 64-bit id.
- Id64bit m_id64;
+ Id64bit _id64;
// Energy deposition.
- G4double m_edep;
+ G4double _edep;
// Position.
- G4ThreeVector m_pos;
+ G4ThreeVector _pos;
// Endcap flag.
- bool m_endcap;
+ bool _endcap;
// List of contributions by MCParticle.
- HitContributionList m_particleList;
+ HitContributionList _particleList;
}; typedef G4THitsCollection<CalorimeterHit> (G4CalorimeterHitsCollection);
diff -u -r1.2 -r1.3 --- HitContribution.hh 3 Jul 2013 23:00:46 -0000 1.2 +++ HitContribution.hh 10 Jul 2013 16:49:46 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/HitContribution.hh,v 1.2 2013/07/03 23:00:46 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/hits/HitContribution.hh,v 1.3 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_HITS_HITCONTRIBUTION_HH #define LCDD_HITS_HITCONTRIBUTION_HH 1
@@ -39,50 +39,50 @@
inline G4int getTrackID() const
{
- return m_trackID;
+ return _trackID;
}
inline G4double getEdep() const
{
- return m_edep;
+ return _edep;
}
inline void incrEdep(G4double incr)
{
- m_edep += incr;
+ _edep += incr;
}
inline G4int getPDGID() const
{
- return m_PdgId;
+ return _PdgId;
}
inline G4double getGlobalTime() const
{
- return m_globalTime;
+ return _globalTime;
}
inline void setMinTime(G4double new_time)
{
- if (new_time < m_globalTime) {
- m_globalTime = new_time;
+ if (new_time < _globalTime) {
+ _globalTime = new_time;
}
}
inline const float* getPosition() const
{
- return m_position;
+ return _position;
}
void printOut(std::ostream&);
private:
- G4int m_trackID; - G4double m_edep; - G4int m_PdgId; - G4double m_globalTime; - float m_position[3];
+ G4int _trackID; + G4double _edep; + G4int _PdgId; + G4double _globalTime; + float _position[3];
}; typedef std::vector<HitContribution> HitContributionList;
diff -u -r1.5 -r1.6 --- TrackInformation.hh 3 Jul 2013 23:53:08 -0000 1.5 +++ TrackInformation.hh 10 Jul 2013 16:49:46 -0000 1.6 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackInformation.hh,v 1.5 2013/07/03 23:53:08 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackInformation.hh,v 1.6 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_HITS_TRACKINFORMATION_HH #define LCDD_HITS_TRACKINFORMATION_HH 1
@@ -94,7 +94,7 @@
*/
inline G4int getOriginalTrackID() const
{
- return m_originalTrackID;
+ return _originalTrackID;
}
/**
@@ -103,7 +103,7 @@
*/
inline ETrackingStatus getOriginalTrackingStatus() const
{
- return m_originalTrackingStatus;
+ return _originalTrackingStatus;
}
/**
@@ -112,7 +112,7 @@
*/
inline ETrackingStatus getTrackingStatus() const
{
- return m_trackingStatus;
+ return _trackingStatus;
}
/**
@@ -121,7 +121,7 @@
*/
inline bool hasTrackerHit() const
{
- return m_hasTrackerHit;
+ return _hasTrackerHit;
}
/**
@@ -130,7 +130,7 @@
*/
inline void setHasTrackerHit(bool hasHit = true)
{
- m_hasTrackerHit = hasHit;
+ _hasTrackerHit = hasHit;
}
/**
@@ -139,7 +139,7 @@
*/
inline void setTrackID(G4int id)
{
- m_originalTrackID = id;
+ _originalTrackID = id;
}
/**
@@ -148,7 +148,7 @@
*/
inline void setTrackingStatus(ETrackingStatus st)
{
- m_trackingStatus = st;
+ _trackingStatus = st;
}
/**
@@ -157,7 +157,7 @@
*/
inline void setOriginalTrackingStatus(ETrackingStatus st)
{
- m_originalTrackingStatus = st;
+ _originalTrackingStatus = st;
}
/**
@@ -166,7 +166,7 @@
*/
inline void setVertexIsNotEndpointOfParent(bool val = true)
{
- m_vertexIsNotEndpointOfParent = val;
+ _vertexIsNotEndpointOfParent = val;
}
/**
@@ -175,7 +175,7 @@
*/
inline bool getVertexIsNotEndpointOfParent() const
{
- return m_vertexIsNotEndpointOfParent;
+ return _vertexIsNotEndpointOfParent;
}
/**
@@ -184,7 +184,7 @@
*/
inline void setBackscatter(bool val = true)
{
- m_backscatter = val;
+ _backscatter = val;
}
/**
@@ -193,7 +193,7 @@
*/
inline bool getBackscatter() const
{
- return m_backscatter;
+ return _backscatter;
}
/**
@@ -202,7 +202,7 @@
*/
inline void setBelowThreshold(bool val = true)
{
- m_belowThreshold = val;
+ _belowThreshold = val;
}
/**
@@ -211,7 +211,7 @@
*/
inline bool getBelowThreshold() const
{
- return m_belowThreshold;
+ return _belowThreshold;
}
/**
@@ -257,16 +257,16 @@
private:
- G4int m_originalTrackID;
+ G4int _originalTrackID;
- ETrackingStatus m_trackingStatus; - ETrackingStatus m_originalTrackingStatus;
+ ETrackingStatus _trackingStatus; + ETrackingStatus _originalTrackingStatus;
- G4bool m_hasTrackerHit;
+ G4bool _hasTrackerHit;
- G4bool m_vertexIsNotEndpointOfParent; - G4bool m_backscatter; - G4bool m_belowThreshold;
+ G4bool _vertexIsNotEndpointOfParent; + G4bool _backscatter; + G4bool _belowThreshold;
}; extern G4Allocator<TrackInformation> TrackInformationAllocator;
diff -u -r1.2 -r1.3 --- TrackerHit.hh 3 Jul 2013 23:00:46 -0000 1.2 +++ TrackerHit.hh 10 Jul 2013 16:49:46 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackerHit.hh,v 1.2 2013/07/03 23:00:46 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/hits/TrackerHit.hh,v 1.3 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_HITS_TRACKERHIT_HH #define LCDD_HITS_TRACKERHIT_HH 1
@@ -65,7 +65,7 @@
*/
void setTdep(const G4double tdep)
{
- m_tdep = tdep;
+ _tdep = tdep;
}
/**
@@ -74,7 +74,7 @@
*/
void setEdep(const G4double edep)
{
- m_edep = edep;
+ _edep = edep;
}
/**
@@ -83,7 +83,7 @@
*/
void setPos(const G4ThreeVector& posXYZ)
{
- m_pos = posXYZ;
+ _pos = posXYZ;
}
/**
@@ -92,7 +92,7 @@
*/
void setMomentum(const G4ThreeVector& mom)
{
- m_mom = mom;
+ _mom = mom;
}
/**
@@ -101,7 +101,7 @@
*/
void setTrackID(const G4int trkID)
{
- m_trkID = trkID;
+ _trkID = trkID;
}
/**
@@ -110,7 +110,7 @@
*/
void setPDG(const G4int pdg)
{
- m_PDG = pdg;
+ _PDG = pdg;
}
/**
@@ -119,7 +119,7 @@
*/
void setLength(const G4double l)
{
- m_length = l;
+ _length = l;
}
/**
@@ -128,7 +128,7 @@
*/
G4double getTdep() const
{
- return m_tdep;
+ return _tdep;
}
/**
@@ -137,7 +137,7 @@
*/
G4double getEdep() const
{
- return m_edep;
+ return _edep;
}
/**
@@ -146,7 +146,7 @@
*/
G4ThreeVector getPos() const
{
- return m_pos;
+ return _pos;
}
/**
@@ -155,7 +155,7 @@
*/
G4ThreeVector getMomentum() const
{
- return m_mom;
+ return _mom;
}
/**
@@ -164,7 +164,7 @@
*/
G4int getTrackID() const
{
- return m_trkID;
+ return _trkID;
}
/**
@@ -173,7 +173,7 @@
*/
G4int getPDG() const
{
- return m_PDG;
+ return _PDG;
}
/**
@@ -182,7 +182,7 @@
*/
G4double getLength() const
{
- return m_length;
+ return _length;
}
/**
@@ -191,7 +191,7 @@
*/
void setId(Id64bit::ElementType id1)
{
- m_id64.setId1(id1);
+ _id64.setId1(id1);
}
/**
@@ -200,21 +200,21 @@
*/
int getId()
{
- return m_id64.getId1();
+ return _id64.getId1();
} public:
- G4double m_edep; - G4double m_tdep; - G4ThreeVector m_pos; - G4ThreeVector m_mom; - G4int m_trkID; - G4int m_PDG; - G4double m_length;
+ G4double _edep; + G4double _tdep; + G4ThreeVector _pos; + G4ThreeVector _mom; + G4int _trkID; + G4int _PDG; + G4double _length;
// TODO: make this a 32-bit, as only first 32-bits are used
- Id64bit m_id64;
+ Id64bit _id64;
}; typedef G4THitsCollection<TrackerHit> (G4TrackerHitsCollection);
diff -u -r1.2 -r1.3 --- Id64bit.hh 3 Jul 2013 23:00:46 -0000 1.2 +++ Id64bit.hh 10 Jul 2013 16:49:46 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/Id64bit.hh,v 1.2 2013/07/03 23:00:46 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/id/Id64bit.hh,v 1.3 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_ID64BIT_HH #define LCDD_ID64BIT_HH 1
@@ -35,8 +35,8 @@
*/
void resetIds()
{
- m_ids[0] = 0; - m_ids[1] = 0;
+ _ids[0] = 0; + _ids[1] = 0;
}
/**
@@ -45,7 +45,7 @@
*/
void setId0(ElementType id0)
{
- m_ids[0] = id0;
+ _ids[0] = id0;
}
/**
@@ -54,7 +54,7 @@
*/
void setId1(ElementType id1)
{
- m_ids[1] = id1;
+ _ids[1] = id1;
}
/**
@@ -63,7 +63,7 @@
*/
ElementType getId0() const
{
- return m_ids[0];
+ return _ids[0];
}
/**
@@ -72,7 +72,7 @@
*/
ElementType getId1() const
{
- return m_ids[1];
+ return _ids[1];
}
/**
@@ -80,11 +80,11 @@
*/
bool operator==(const Id64bit& right) const
{
- return (m_ids[0] == right.m_ids[0] && m_ids[1] == right.m_ids[1]);
+ return (_ids[0] == right._ids[0] && _ids[1] == right._ids[1]);
} private:
- ElementType m_ids[2];
+ ElementType _ids[2];
}; #endif
diff -u -r1.2 -r1.3 --- IdManager.hh 3 Jul 2013 23:00:46 -0000 1.2 +++ IdManager.hh 10 Jul 2013 16:49:46 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdManager.hh,v 1.2 2013/07/03 23:00:46 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/id/IdManager.hh,v 1.3 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_IDMANAGER_HH #define LCDD_IDMANAGER_HH 1
@@ -91,7 +91,7 @@
*/
const IdSpecs* getIdSpecStore()
{
- return &m_idSpecs;
+ return &_idSpecs;
}
/**
@@ -111,7 +111,7 @@
*/
bool hasPhysVolIds(G4VPhysicalVolume* pv) const
{
- return m_physVolIdMap.hasPhysVolIds(pv);
+ return _physVolIdMap.hasPhysVolIds(pv);
}
/**
@@ -121,7 +121,7 @@
*/
const PhysVolIdMap& getPhysVolIdMap() const
{
- return m_physVolIdMap;
+ return _physVolIdMap;
}
/**
@@ -131,7 +131,7 @@
*/
PhysVolId::PhysVolIds& getPhysVolIds(G4VPhysicalVolume* pv)
{
- return m_physVolIdMap.getPhysVolIds(pv);
+ return _physVolIdMap.getPhysVolIds(pv);
}
/**
@@ -144,13 +144,13 @@
private:
// static singleton instance
- static IdManager* m_instance;
+ static IdManager* _instance;
// id specifications by name
- IdSpecs m_idSpecs;
+ IdSpecs _idSpecs;
// map of PV ids
- PhysVolIdMap m_physVolIdMap;
+ PhysVolIdMap _physVolIdMap;
}; #endif
diff -u -r1.3 -r1.4 --- AuthorType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ AuthorType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/AuthorType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/AuthorType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_AUTHORTYPE_HH #define LCDD_SCHEMA_AUTHORTYPE_HH 1
@@ -22,28 +22,28 @@
void set_name(const std::string& n)
{
- m_name = n;
+ _name = n;
}
void set_email(const std::string& o)
{
- m_email = o;
+ _email = o;
}
const std::string& get_name() const
{
- return m_name;
+ return _name;
}
const std::string& get_email() const
{
- return m_email;
+ return _email;
} private:
- std::string m_name; - std::string m_email;
+ std::string _name; + std::string _email;
}; #endif
diff -u -r1.3 -r1.4 --- CalorimeterType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ CalorimeterType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/CalorimeterType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/CalorimeterType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_CALORIMETERTYPE_HH #define LCDD_SCHEMA_CALORIMETERTYPE_HH 1
@@ -32,31 +32,31 @@
const ContentSequence* get_content() const
{
- return &m_sequence;
+ return &_sequence;
}
// add a segmentation
void add_content(const std::string& tag, SAXObject* so)
{
ContentGroup::ContentItem ci = { tag, so };
- m_sequence.add_content(ci);
+ _sequence.add_content(ci);
}
void set_compare(const std::string& compare)
{
- m_compare = compare;
+ _compare = compare;
}
const std::string& get_compare() const
{
- return m_compare;
+ return _compare;
} private:
- ContentSequence m_sequence;
+ ContentSequence _sequence;
- std::string m_compare;
+ std::string _compare;
};
diff -u -r1.4 -r1.5 --- CellReadout2DSegmentationType.hh 8 Jul 2013 21:38:10 -0000 1.4 +++ CellReadout2DSegmentationType.hh 10 Jul 2013 16:49:46 -0000 1.5 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/CellReadout2DSegmentationType.hh,v 1.4 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/CellReadout2DSegmentationType.hh,v 1.5 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_CELLREADOUT2DSEGMENTATIONTYPE_HH #define LCDD_CELLREADOUT2DSEGMENTATIONTYPE_HH 1
@@ -29,39 +29,39 @@
void setCellSizeX(const std::string& cellSizeX)
{
- m_cellSizeX = cellSizeX;
+ _cellSizeX = cellSizeX;
}
void setCellSizeY(const std::string& cellSizeY)
{
- m_cellSizeY = cellSizeY;
+ _cellSizeY = cellSizeY;
}
void setLengthUnit(const std::string& lengthUnit)
{
- m_lengthUnit = lengthUnit;
+ _lengthUnit = lengthUnit;
}
const std::string& getCellSizeX()
{
- return m_cellSizeX;
+ return _cellSizeX;
}
const std::string& getCellSizeY()
{
- return m_cellSizeY;
+ return _cellSizeY;
}
const std::string& getLengthUnit()
{
- return m_lengthUnit;
+ return _lengthUnit;
} protected:
- std::string m_cellSizeX; - std::string m_cellSizeY; - std::string m_lengthUnit;
+ std::string _cellSizeX; + std::string _cellSizeY; + std::string _lengthUnit;
}; #endif
diff -u -r1.3 -r1.4 --- ColorType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ ColorType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/ColorType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/ColorType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_COLORTYPE_HH #define LCDD_SCHEMA_COLORTYPE_HH 1
@@ -22,49 +22,49 @@
void set_R(const std::string& r)
{
- m_R = r;
+ _R = r;
}
void set_G(const std::string& g)
{
- m_G = g;
+ _G = g;
}
void set_B(const std::string& b)
{
- m_B = b;
+ _B = b;
}
void set_alpha(const std::string& a)
{
- m_alpha = a;
+ _alpha = a;
}
const std::string& get_R()
{
- return m_R;
+ return _R;
}
const std::string& get_G()
{
- return m_G;
+ return _G;
}
const std::string& get_B()
{
- return m_B;
+ return _B;
}
const std::string& get_alpha()
{
- return m_alpha;
+ return _alpha;
} private:
- std::string m_R; - std::string m_G; - std::string m_B; - std::string m_alpha;
+ std::string _R; + std::string _G; + std::string _B; + std::string _alpha;
}; #endif
diff -u -r1.3 -r1.4 --- CommentType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ CommentType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/CommentType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/CommentType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_COMMENTTYPE_HH #define LCDD_SCHEMA_COMMENTTYPE_HH 1
@@ -22,17 +22,17 @@
void set_comment(const std::string& c)
{
- m_comment = c;
+ _comment = c;
}
const std::string& get_comment() const
{
- return m_comment;
+ return _comment;
} private:
- std::string m_comment;
+ std::string _comment;
};
diff -u -r1.3 -r1.4 --- DetectorType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ DetectorType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/DetectorType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/DetectorType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_DETECTORTYPE_HH #define LCDD_SCHEMA_DETECTORTYPE_HH 1
@@ -24,38 +24,38 @@
void set_name(const std::string& n)
{
- m_name = n;
+ _name = n;
}
void set_version(const std::string& v)
{
- m_version = v;
+ _version = v;
}
void set_url(const std::string& u)
{
- m_url = u;
+ _url = u;
}
const std::string& get_name() const
{
- return m_name;
+ return _name;
}
const std::string& get_version() const
{
- return m_version;
+ return _version;
}
const std::string& get_url() const
{
- return m_url;
+ return _url;
} private:
- std::string m_name; - std::string m_version; - std::string m_url;
+ std::string _name; + std::string _version; + std::string _url;
}; #endif
diff -u -r1.3 -r1.4 --- DipoleCoeffType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ DipoleCoeffType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/DipoleCoeffType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/DipoleCoeffType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_DIPOLECOEFFTYPE_HH #define LCDD_SCHEMA_DIPOLECOEFFTYPE_HH
@@ -23,16 +23,16 @@
void set_value(const std::string& s)
{
- m_value = s;
+ _value = s;
}
const std::string& get_value()
{
- return m_value;
+ return _value;
} private:
- std::string m_value;
+ std::string _value;
}; #endif
diff -u -r1.3 -r1.4 --- DipoleType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ DipoleType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/DipoleType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/DipoleType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_DIPOLETYPE_HH #define LCDD_SCHEMA_DIPOLETYPE_HH 1
@@ -31,52 +31,52 @@
void set_zmax(const std::string& s)
{
- m_zmax = s;
+ _zmax = s;
}
void set_zmin(const std::string& s)
{
- m_zmin = s;
+ _zmin = s;
}
void set_rmax(const std::string& s)
{
- m_rmax = s;
+ _rmax = s;
}
const std::string& get_zmin() const
{
- return m_zmin;
+ return _zmin;
}
const std::string& get_zmax() const
{
- return m_zmax;
+ return _zmax;
}
const std::string& get_rmax() const
{
- return m_rmax;
+ return _rmax;
}
void add_content(const std::string& tag, SAXObject* so)
{
ContentGroup::ContentItem ci = { tag, so };
- m_sequence.add_content(ci);
+ _sequence.add_content(ci);
}
const ContentSequence* get_content() const
{
- return &m_sequence;
+ return &_sequence;
} private:
- std::string m_zmax; - std::string m_zmin; - std::string m_rmax;
+ std::string _zmax; + std::string _zmin; + std::string _rmax;
- ContentSequence m_sequence;
+ ContentSequence _sequence;
}; #endif
diff -u -r1.3 -r1.4 --- FieldMapType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ FieldMapType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/FieldMapType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/FieldMapType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_FIELDMAPTYPE_HH #define LCDD_SCHEMA_FIELDMAPTYPE_HH 1
@@ -28,18 +28,18 @@
const ContentSequence* get_content() const
{
- return &m_sequence;
+ return &_sequence;
}
void add_content(const std::string& tag, SAXObject* so)
{
ContentGroup::ContentItem ci = { tag, so };
- m_sequence.add_content(ci);
+ _sequence.add_content(ci);
} public:
- ContentSequence m_sequence;
+ ContentSequence _sequence;
};
diff -u -r1.3 -r1.4 --- GeneratorType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ GeneratorType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/GeneratorType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/GeneratorType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_GENERATORTYPE_HH #define LCDD_SCHEMA_GENERATORTYPE_HH 1
@@ -22,50 +22,50 @@
void set_name(const std::string& n)
{
- m_name = n;
+ _name = n;
}
void set_version(const std::string& v)
{
- m_version = v;
+ _version = v;
}
void set_file(const std::string& u)
{
- m_file = u;
+ _file = u;
}
void set_checksum(const std::string& c)
{
- m_checksum = c;
+ _checksum = c;
}
const std::string& get_name() const
{
- return m_name;
+ return _name;
}
const std::string& get_version() const
{
- return m_version;
+ return _version;
}
const std::string& get_file() const
{
- return m_file;
+ return _file;
}
const std::string& get_checksum() const
{
- return m_checksum;
+ return _checksum;
} private:
- std::string m_name; - std::string m_version; - std::string m_file; - std::string m_checksum;
+ std::string _name; + std::string _version; + std::string _file; + std::string _checksum;
}; #endif
diff -u -r1.3 -r1.4 --- GlobalFieldType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ GlobalFieldType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/GlobalFieldType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/GlobalFieldType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_GLOBALFIELDTYPE_HH #define LCDD_SCHEMA_GLOBALFIELDTYPE_HH 1
@@ -22,18 +22,18 @@
const ContentSequence* get_content() const
{
- return &m_sequence;
+ return &_sequence;
}
void add_content(const std::string& tag, SAXObject* so)
{
ContentGroup::ContentItem ci = { tag, so };
- m_sequence.add_content(ci);
+ _sequence.add_content(ci);
} private:
- ContentSequence m_sequence;
+ ContentSequence _sequence;
}; #endif
diff -u -r1.3 -r1.4 --- GlobalGridXYSegmentationType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ GlobalGridXYSegmentationType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/GlobalGridXYSegmentationType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/GlobalGridXYSegmentationType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_GLOBALGRIDXYSEGMENTATIONTYPE_HH #define LCDD_SCHEMA_GLOBALGRIDXYSEGMENTATIONTYPE_HH 1
@@ -31,39 +31,39 @@
void set_gridSizeX(const std::string& gsx)
{
- m_gridSizeX = gsx;
+ _gridSizeX = gsx;
}
void set_gridSizeY(const std::string& gsy)
{
- m_gridSizeY = gsy;
+ _gridSizeY = gsy;
}
void set_lunit(const std::string& lunit)
{
- m_lunit = lunit;
+ _lunit = lunit;
}
const std::string& get_gridSizeX()
{
- return m_gridSizeX;
+ return _gridSizeX;
}
const std::string& get_gridSizeY()
{
- return m_gridSizeY;
+ return _gridSizeY;
}
const std::string& get_lunit()
{
- return m_lunit;
+ return _lunit;
} protected:
- std::string m_gridSizeX; - std::string m_gridSizeY; - std::string m_lunit;
+ std::string _gridSizeX; + std::string _gridSizeY; + std::string _lunit;
}; #endif
diff -u -r1.3 -r1.4 --- HeaderType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ HeaderType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/HeaderType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/HeaderType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_HEADERTYPE_HH #define LCDD_SCHEMA_HEADERTYPE_HH 1
@@ -26,17 +26,17 @@
void add_content(const std::string& tag, SAXObject* so)
{
ContentGroup::ContentItem ci = { tag, so };
- m_sequence.add_content(ci);
+ _sequence.add_content(ci);
}
const ContentSequence* get_content() const
{
- return &m_sequence;
+ return &_sequence;
} private:
- ContentSequence m_sequence;
+ ContentSequence _sequence;
}; #endif
diff -u -r1.3 -r1.4 --- IdFieldType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ IdFieldType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/IdFieldType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/IdFieldType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_IDFIELDTYPE_HH #define LCDD_SCHEMA_IDFIELDTYPE_HH 1
@@ -24,49 +24,49 @@
void set_label(const std::string& l)
{
- m_label = l;
+ _label = l;
}
void set_start(const std::string& s)
{
- m_start = s;
+ _start = s;
}
void set_length(const std::string& l)
{
- m_length = l;
+ _length = l;
}
void set_signed(const std::string& s)
{
- m_signed = s;
+ _signed = s;
}
const std::string& get_label()
{
- return m_label;
+ return _label;
}
const std::string& get_start()
{
- return m_start;
+ return _start;
}
const std::string& get_length()
{
- return m_length;
+ return _length;
}
const std::string& get_signed()
{
- return m_signed;
+ return _signed;
} private:
- std::string m_label; - std::string m_start; - std::string m_length; - std::string m_signed;
+ std::string _label; + std::string _start; + std::string _length; + std::string _signed;
}; #endif
diff -u -r1.3 -r1.4 --- IdSpecType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ IdSpecType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/IdSpecType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/IdSpecType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_IDSPECTYPE_HH #define LCDD_SCHEMA_IDSPECTYPE_HH 1
@@ -50,41 +50,41 @@
void set_name(const std::string& n)
{
- m_name = n;
+ _name = n;
}
void set_length(const std::string& l)
{
- m_length = l;
+ _length = l;
}
const std::string& get_name() const
{
- return m_name;
+ return _name;
}
const std::string& get_length() const
{
- return m_length;
+ return _length;
}
const ContentSequence* get_content() const
{
- return &m_sequence;
+ return &_sequence;
}
void add_content(const std::string& tag, SAXObject* so)
{
ContentGroup::ContentItem ci = { tag, so };
- m_sequence.add_content(ci);
+ _sequence.add_content(ci);
} private:
- std::string m_name; - std::string m_length;
+ std::string _name; + std::string _length;
- ContentSequence m_sequence;
+ ContentSequence _sequence;
}; #endif
diff -u -r1.3 -r1.4 --- LimitParamType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ LimitParamType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/LimitParamType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/LimitParamType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_LIMITPARAMTYPE_HH #define LCDD_SCHEMA_LIMITPARAMTYPE_HH 1
@@ -22,49 +22,49 @@
void set_particles(const std::string& p)
{
- m_particles = p;
+ _particles = p;
}
const std::string& get_particles() const
{
- return m_particles;
+ return _particles;
}
void set_name(const std::string& n)
{
- m_name = n;
+ _name = n;
}
const std::string& get_name() const
{
- return m_name;
+ return _name;
}
void set_value(const std::string& v)
{
- m_value = v;
+ _value = v;
}
const std::string& get_value() const
{
- return m_value;
+ return _value;
}
void set_unit(const std::string& u)
{
- m_unit = u;
+ _unit = u;
}
const std::string& get_unit() const
{
- return m_unit;
+ return _unit;
} public:
- std::string m_particles; - std::string m_value; - std::string m_name; - std::string m_unit;
+ std::string _particles; + std::string _value; + std::string _name; + std::string _unit;
}; #endif
diff -u -r1.3 -r1.4 --- LimitSetType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ LimitSetType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/LimitSetType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/LimitSetType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_LIMITSETTYPE_HH #define LCDD_SCHEMA_LIMITSETTYPE_HH 1
@@ -45,29 +45,29 @@
void set_name(const std::string& n)
{
- m_name = n;
+ _name = n;
}
const std::string& get_name() const
{
- return m_name;
+ return _name;
}
void add_content(const std::string& tag, SAXObject* so)
{
ContentGroup::ContentItem ci = { tag, so };
- m_sequence.add_content(ci);
+ _sequence.add_content(ci);
}
const ContentSequence* get_content() const
{
- return &m_sequence;
+ return &_sequence;
} private:
- ContentSequence m_sequence; - std::string m_name;
+ ContentSequence _sequence; + std::string _name;
}; #endif
diff -u -r1.3 -r1.4 --- LimitType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ LimitType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/LimitType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/LimitType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_LIMITTYPE_HH #define LCDD_SCHEMA_LIMITTYPE_HH
@@ -47,107 +47,107 @@
const std::string& get_name() const
{
- return m_name;
+ return _name;
}
const std::string& get_step_length_max() const
{
- return m_step_length_max;
+ return _stepLengthMax;
}
const std::string& get_track_length_max() const
{
- return m_track_length_max;
+ return _trackLengthMax;
}
const std::string& get_time_max() const
{
- return m_time_max;
+ return _timeMax;
}
const std::string& get_ekin_min() const
{
- return m_ekin_min;
+ return _ekinMin;
}
const std::string& get_range_min() const
{
- return m_range_min;
+ return _rangeMin;
}
const std::string& get_eunit() const
{
- return m_eunit;
+ return _eunit;
}
const std::string& get_lunit() const
{
- return m_lunit;
+ return _lunit;
}
const std::string& get_tunit() const
{
- return m_tunit;
+ return _tunit;
}
void set_name(const std::string& s)
{
- m_name = s;
+ _name = s;
}
void set_step_length_max(const std::string& s)
{
- m_step_length_max = s;
+ _stepLengthMax = s;
}
void set_track_length_max(const std::string& s)
{
- m_track_length_max = s;
+ _trackLengthMax = s;
}
void set_time_max(const std::string& s)
{
- m_time_max = s;
+ _timeMax = s;
}
void set_ekin_min(const std::string& s)
{
- m_ekin_min = s;
+ _ekinMin = s;
}
void set_range_min(const std::string& s)
{
- m_range_min = s;
+ _rangeMin = s;
}
void set_eunit(const std::string& s)
{
- m_eunit = s;
+ _eunit = s;
}
void set_lunit(const std::string& s)
{
- m_lunit = s;
+ _lunit = s;
}
void set_tunit(const std::string& s)
{
- m_tunit = s;
+ _tunit = s;
} private:
- std::string m_name;
+ std::string _name;
- std::string m_step_length_max; - std::string m_track_length_max; - std::string m_time_max; - std::string m_ekin_min; - std::string m_range_min; - - std::string m_eunit; - std::string m_lunit; - std::string m_tunit;
+ std::string _stepLengthMax; + std::string _trackLengthMax; + std::string _timeMax; + std::string _ekinMin; + std::string _rangeMin; + + std::string _eunit; + std::string _lunit; + std::string _tunit;
}; #endif
diff -u -r1.3 -r1.4 --- NonprojectiveCylinderSegmentationType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ NonprojectiveCylinderSegmentationType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/NonprojectiveCylinderSegmentationType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/NonprojectiveCylinderSegmentationType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_NONPROJECTIVECYLINDERSEGMENTATIONTYPE_HH #define LCDD_SCHEMA_NONPROJECTIVECYLINDERSEGMENTATIONTYPE_HH 1
@@ -28,39 +28,39 @@
void set_gridSizeZ(const std::string& gsz)
{
- m_gridSizeZ = gsz;
+ _gridSizeZ = gsz;
}
void set_gridSizePhi(const std::string& gsp)
{
- m_gridSizePhi = gsp;
+ _gridSizePhi = gsp;
}
void set_lunit(const std::string& lunit)
{
- m_lunit = lunit;
+ _lunit = lunit;
}
const std::string& get_gridSizeZ()
{
- return m_gridSizeZ;
+ return _gridSizeZ;
}
const std::string& get_gridSizePhi()
{
- return m_gridSizePhi;
+ return _gridSizePhi;
}
const std::string& get_lunit()
{
- return m_lunit;
+ return _lunit;
} protected:
- std::string m_gridSizeZ; - std::string m_gridSizePhi; - std::string m_lunit;
+ std::string _gridSizeZ; + std::string _gridSizePhi; + std::string _lunit;
}; #endif
diff -u -r1.3 -r1.4 --- NonprojectiveSegmentationType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ NonprojectiveSegmentationType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/NonprojectiveSegmentationType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/NonprojectiveSegmentationType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_NONPROJECTIVESEGMENTATIONTYPE_HH #define LCDD_SCHEMA_NONPROJECTIVESEGMENTATIONTYPE_HH 1
@@ -28,50 +28,50 @@
void set_gridSizeX(const std::string& gsx)
{
- m_gridSizeX = gsx;
+ _gridSizeX = gsx;
}
void set_gridSizeY(const std::string& gsy)
{
- m_gridSizeY = gsy;
+ _gridSizeY = gsy;
}
void set_gridSizeZ(const std::string& gsz)
{
- m_gridSizeZ = gsz;
+ _gridSizeZ = gsz;
}
void set_lunit(const std::string& lunit)
{
- m_lunit = lunit;
+ _lunit = lunit;
}
const std::string& get_gridSizeX()
{
- return m_gridSizeX;
+ return _gridSizeX;
}
const std::string& get_gridSizeY()
{
- return m_gridSizeY;
+ return _gridSizeY;
}
const std::string& get_gridSizeZ()
{
- return m_gridSizeZ;
+ return _gridSizeZ;
}
const std::string& get_lunit()
{
- return m_lunit;
+ return _lunit;
} protected:
- std::string m_gridSizeX; - std::string m_gridSizeY; - std::string m_gridSizeZ; - std::string m_lunit;
+ std::string _gridSizeX; + std::string _gridSizeY; + std::string _gridSizeZ; + std::string _lunit;
}; #endif
diff -u -r1.3 -r1.4 --- PhysVolIdType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ PhysVolIdType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/PhysVolIdType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/PhysVolIdType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_PHYSVOLIDTYPE_HH #define LCDD_SCHEMA_PHYSVOLIDTYPE_HH 1
@@ -22,28 +22,28 @@
void set_value(const std::string& v)
{
- m_value = v;
+ _value = v;
}
void set_field_name(const std::string& f)
{
- m_field_name = f;
+ _fieldName = f;
}
const std::string& get_value()
{
- return m_value;
+ return _value;
}
const std::string& get_field_name()
{
- return m_field_name;
+ return _fieldName;
} private:
- std::string m_value; - std::string m_field_name;
+ std::string _value; + std::string _fieldName;
}; #endif
diff -u -r1.3 -r1.4 --- ProjectiveCylinderSegmentationType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ ProjectiveCylinderSegmentationType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/ProjectiveCylinderSegmentationType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/ProjectiveCylinderSegmentationType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_PROJECTIVECYLINDERSEGMENTATIONTYPE_HH #define LCDD_SCHEMA_PROJECTIVECYLINDERSEGMENTATIONTYPE_HH 1
@@ -28,27 +28,27 @@
void set_ntheta(const std::string& ntheta)
{
- m_ntheta = ntheta;
+ _ntheta = ntheta;
}
void set_nphi(const std::string& nphi)
{
- m_nphi = nphi;
+ _nphi = nphi;
}
const std::string& get_ntheta() const
{
- return m_ntheta;
+ return _ntheta;
}
const std::string& get_nphi() const
{
- return m_nphi;
+ return _nphi;
} protected:
- std::string m_ntheta, m_nphi;
+ std::string _ntheta, _nphi;
}; #endif
diff -u -r1.3 -r1.4 --- ProjectiveZPlaneSegmentationType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ ProjectiveZPlaneSegmentationType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/ProjectiveZPlaneSegmentationType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/ProjectiveZPlaneSegmentationType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_PROJECTIVEZPLANESEGMENTATIONTYPE_HH #define LCDD_SCHEMA_PROJECTIVEZPLANESEGMENTATIONTYPE_HH 1
@@ -28,27 +28,27 @@
void set_ntheta(const std::string& ntheta)
{
- m_ntheta = ntheta;
+ _ntheta = ntheta;
}
void set_nphi(const std::string& nphi)
{
- m_nphi = nphi;
+ _nphi = nphi;
}
const std::string& get_ntheta() const
{
- return m_ntheta;
+ return _ntheta;
}
const std::string& get_nphi() const
{
- return m_nphi;
+ return _nphi;
} protected:
- std::string m_ntheta, m_nphi;
+ std::string _ntheta, _nphi;
}; #endif
diff -u -r1.3 -r1.4 --- RZBType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ RZBType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/RZBType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/RZBType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_RZBTYPE_HH #define LCDD_SCHEMA_RZBTYPE_HH 1
@@ -22,49 +22,49 @@
void set_r(const std::string& r)
{
- m_r = r;
+ _r = r;
}
void set_z(const std::string& z)
{
- m_z = z;
+ _z = z;
}
void set_Br(const std::string& Br)
{
- m_Br = Br;
+ _Br = Br;
}
void set_Bz(const std::string& Bz)
{
- m_Bz = Bz;
+ _Bz = Bz;
}
const std::string& get_r() const
{
- return m_r;
+ return _r;
}
const std::string& get_z() const
{
- return m_z;
+ return _z;
}
const std::string& get_Br() const
{
- return m_Br;
+ return _Br;
}
const std::string& get_Bz() const
{
- return m_Bz;
+ return _Bz;
} public:
- std::string m_r; - std::string m_z; - std::string m_Br; - std::string m_Bz;
+ std::string _r; + std::string _z; + std::string _Br; + std::string _Bz;
}; #endif
diff -u -r1.3 -r1.4 --- RZFieldMapType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ RZFieldMapType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/RZFieldMapType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/RZFieldMapType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_RZFIELDMAPTYPE_HH #define LCDD_SCHEMA_RZFIELDMAPTYPE_HH 1
@@ -23,49 +23,49 @@
void set_num_bins_r(const std::string& num_bins_r)
{
- m_num_bins_r = num_bins_r;
+ _num_bins_r = num_bins_r;
}
const std::string& get_num_bins_r() const
{
- return m_num_bins_r;
+ return _num_bins_r;
}
void set_grid_size_r(const std::string& grid_size_r)
{
- m_grid_size_r = grid_size_r;
+ _grid_size_r = grid_size_r;
}
const std::string& get_grid_size_r() const
{
- return m_grid_size_r;
+ return _grid_size_r;
}
void set_num_bins_z(const std::string& num_bins_z)
{
- m_num_bins_z = num_bins_z;
+ _num_bins_z = num_bins_z;
}
const std::string& get_num_bins_z() const
{
- return m_num_bins_z;
+ return _num_bins_z;
}
void set_grid_size_z(const std::string& grid_size_z)
{
- m_grid_size_z = grid_size_z;
+ _grid_size_z = grid_size_z;
}
const std::string& get_grid_size_z() const
{
- return m_grid_size_z;
+ return _grid_size_z;
} private:
- std::string m_num_bins_r; - std::string m_grid_size_r; - std::string m_num_bins_z; - std::string m_grid_size_z;
+ std::string _num_bins_r; + std::string _grid_size_r; + std::string _num_bins_z; + std::string _grid_size_z;
}; #endif
diff -u -r1.3 -r1.4 --- RegionType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ RegionType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/RegionType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/RegionType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_REGIONTYPE_HH #define LCDD_SCHEMA_REGIONTYPE_HH 1
@@ -49,99 +49,99 @@
void set_name(const std::string& s)
{
- m_name = s;
+ _name = s;
}
void set_storeSecondaries(const std::string& s)
{
- m_storeSecondaries = s;
+ _storeSecondaries = s;
}
void set_killTracks(const std::string& killTracks)
{
- m_killTracks = killTracks;
+ _killTracks = killTracks;
}
void set_cut(const std::string& s)
{
- m_cut = s;
+ _cut = s;
}
void set_lunit(const std::string& s)
{
- m_lunit = s;
+ _lunit = s;
}
void set_threshold(const std::string& s)
{
- m_threshold = s;
+ _threshold = s;
}
void set_eunit(const std::string& s)
{
- m_eunit = s;
+ _eunit = s;
}
const std::string& get_name() const
{
- return m_name;
+ return _name;
}
const std::string& get_storeSecondaries() const
{
- return m_storeSecondaries;
+ return _storeSecondaries;
}
const std::string& get_killTracks() const
{
- return m_killTracks;
+ return _killTracks;
}
const std::string& get_cut() const
{
- return m_cut;
+ return _cut;
}
const std::string& get_lunit() const
{
- return m_lunit;
+ return _lunit;
}
const std::string& get_threshold() const
{
- return m_threshold;
+ return _threshold;
}
const std::string& get_eunit() const
{
- return m_eunit;
+ return _eunit;
}
void add_content(const std::string& tag, SAXObject* so)
{
ContentGroup::ContentItem ci = { tag, so };
- m_sequence.add_content(ci);
+ _sequence.add_content(ci);
}
const ContentSequence* get_content() const
{
- return &m_sequence;
+ return &_sequence;
} private:
- ContentSequence m_sequence;
+ ContentSequence _sequence;
- std::string m_name;
+ std::string _name;
- std::string m_storeSecondaries; - std::string m_killTracks;
+ std::string _storeSecondaries; + std::string _killTracks;
- std::string m_cut; - std::string m_lunit;
+ std::string _cut; + std::string _lunit;
- std::string m_threshold; - std::string m_eunit;
+ std::string _threshold; + std::string _eunit;
}; #endif
diff -u -r1.3 -r1.4 --- SensitiveDetectorType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ SensitiveDetectorType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/SensitiveDetectorType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/SensitiveDetectorType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_SENSITIVEDETECTORTYPE_HH #define LCDD_SCHEMA_SENSITIVEDETECTORTYPE_HH 1
@@ -50,97 +50,97 @@
void set_name(const std::string& n)
{
- m_name = n;
+ _name = n;
}
void set_hitsCollectionName(const std::string& hcn)
{
- m_hitsCollectionName = hcn;
+ _hitsCollectionName = hcn;
}
const std::string& get_hitsCollectionName() const
{
- return m_hitsCollectionName;
+ return _hitsCollectionName;
}
void set_eunit(const std::string& eu)
{
- m_eunit = eu;
+ _eunit = eu;
}
void set_ecut(const std::string& ec)
{
- m_ecut = ec;
+ _ecut = ec;
}
void set_verbose(const std::string& v)
{
- m_verbose = v;
+ _verbose = v;
}
void set_type(const std::string& t)
{
- m_type = t;
+ _type = t;
}
void set_endcap_flag(const std::string& e)
{
- m_endcap_flag = e;
+ _endcapFlag = e;
}
const std::string& get_name() const
{
- return m_name;
+ return _name;
}
const std::string& get_eunit() const
{
- return m_eunit;
+ return _eunit;
}
const std::string& get_ecut() const
{
- return m_ecut;
+ return _ecut;
}
const std::string& get_verbose() const
{
- return m_verbose;
+ return _verbose;
}
const std::string& get_type() const
{
- return m_type;
+ return _type;
}
const std::string& get_endcap_flag() const
{
- return m_endcap_flag;
+ return _endcapFlag;
}
const ContentSequence* get_content() const
{
- return &m_sequence;
+ return &_sequence;
}
// add content
void add_content(const std::string& tag, SAXObject* so)
{
ContentGroup::ContentItem ci = { tag, so };
- m_sequence.add_content(ci);
+ _sequence.add_content(ci);
} private:
- ContentSequence m_sequence;
+ ContentSequence _sequence;
- std::string m_name; - std::string m_hitsCollectionName; - std::string m_endcap_flag; - std::string m_eunit; - std::string m_ecut; - std::string m_verbose; - std::string m_type;
+ std::string _name; + std::string _hitsCollectionName; + std::string _endcapFlag; + std::string _eunit; + std::string _ecut; + std::string _verbose; + std::string _type;
}; #endif
diff -u -r1.3 -r1.4 --- TrackerType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ TrackerType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/TrackerType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/TrackerType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_TRACKERTYPE_HH #define LCDD_SCHEMA_TRACKERTYPE_HH 1
@@ -27,16 +27,16 @@
void set_combine_hits(const std::string& c)
{
- m_combine_hits = c;
+ _combineHits = c;
}
const std::string& get_combine_hits() const
{
- return m_combine_hits;
+ return _combineHits;
} private:
- std::string m_combine_hits;
+ std::string _combineHits;
}; #endif
diff -u -r1.3 -r1.4 --- VisType.hh 8 Jul 2013 21:38:10 -0000 1.3 +++ VisType.hh 10 Jul 2013 16:49:46 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/lcdd/schema/VisType.hh,v 1.3 2013/07/08 21:38:10 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/lcdd/schema/VisType.hh,v 1.4 2013/07/10 16:49:46 jeremy Exp $
#ifndef LCDD_SCHEMA_VISTYPE_HH #define LCDD_SCHEMA_VISTYPE_HH 1
@@ -49,74 +49,74 @@
void set_name(const std::string& n)
{
- m_name = n;
+ _name = n;
}
void set_visible(const std::string& v)
{
- m_visible = v;
+ _visible = v;
}
void set_show_daughters(const std::string& d)
{
- m_show_daughters = d;
+ _showDaughters = d;
}
void set_line_style(const std::string& l)
{
- m_line_style = l;
+ _lineStyle = l;
}
void set_drawing_style(const std::string& d)
{
- m_drawing_style = d;
+ _drawingStyle = d;
}
const std::string& get_name() const
{
- return m_name;
+ return _name;
}
const std::string& get_visible() const
{
- return m_visible;
+ return _visible;
}
const std::string& get_show_daughters() const
{
- return m_show_daughters;
+ return _showDaughters;
}
const std::string& get_line_style() const
{
- return m_line_style;
+ return _lineStyle;
}
const std::string& get_drawing_style() const
{
- return m_drawing_style;
+ return _drawingStyle;
}
const ContentSequence* get_content() const
{
- return &m_sequence;
+ return &_sequence;
}
void add_content(const std::string& tag, SAXObject* so)
{
ContentGroup::ContentItem ci = { tag, so };
- m_sequence.add_content(ci);
+ _sequence.add_content(ci);
} private:
- ContentSequence m_sequence;
+ ContentSequence _sequence;
- std::string m_name; - std::string m_visible; - std::string m_show_daughters; - std::string m_line_style; - std::string m_drawing_style;
+ std::string _name; + std::string _visible; + std::string _showDaughters; + std::string _lineStyle; + std::string _drawingStyle;
}; #endif
diff -u -r1.1 -r1.2 --- LCDDDetectorConstruction.cc 26 Jun 2013 23:50:59 -0000 1.1 +++ LCDDDetectorConstruction.cc 10 Jul 2013 16:49:47 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/core/LCDDDetectorConstruction.cc,v 1.1 2013/06/26 23:50:59 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/core/LCDDDetectorConstruction.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/core/LCDDDetectorConstruction.hh"
@@ -18,13 +18,13 @@
#include <cassert> LCDDDetectorConstruction::LCDDDetectorConstruction() :
- m_world(0)
+ _world(0)
{
// LCDD messenger
- m_messenger = new LCDDMessenger();
+ _messenger = new LCDDMessenger();
// writer messenger
- m_writerMessenger = new GDMLWriterMessenger();
+ _writerMessenger = new GDMLWriterMessenger();
// setup geo manager
GeometryManager::instance();
@@ -32,14 +32,14 @@
// setup parser if not already
LCDDParser::instance();
- m_inspector = new LCDDObjectStoreInspector();
+ _inspector = new LCDDObjectStoreInspector();
}
LCDDDetectorConstruction::~LCDDDetectorConstruction()
{
- delete m_inspector; - delete m_writerMessenger; - delete m_messenger;
+ delete _inspector; + delete _writerMessenger; + delete _messenger;
} G4VPhysicalVolume* LCDDDetectorConstruction::Construct()
@@ -69,11 +69,11 @@
G4Exception("", "", FatalException, "PhysVol points to null.");
}
- m_world = pv;
+ _world = pv;
}
G4VPhysicalVolume* LCDDDetectorConstruction::getWorldVolume()
{
- return m_world;
+ return _world;
}
diff -u -r1.2 -r1.3 --- LCDDMessenger.cc 2 Jul 2013 21:19:44 -0000 1.2 +++ LCDDMessenger.cc 10 Jul 2013 16:49:47 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/core/LCDDMessenger.cc,v 1.2 2013/07/02 21:19:44 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/core/LCDDMessenger.cc,v 1.3 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/core/LCDDMessenger.hh"
@@ -21,11 +21,11 @@
}
LCDDMessenger::~LCDDMessenger() {
- delete m_setupCmd; - delete m_setURICmd; - delete m_setSetupNameCmd; - delete m_setVersionCmd; - delete m_lcddDir;
+ delete _setupCmd; + delete _setURICmd; + delete _setSetupNameCmd; + delete _setVersionCmd; + delete _lcddDir;
}
void LCDDMessenger::SetNewValue(G4UIcommand *cmd, G4String newVals) {
@@ -34,13 +34,13 @@
G4String singleArg = newVals; std::istringstream is((const char*) newVals);
- if (cmd == m_setURICmd) {
+ if (cmd == _setURICmd) {
parser->setURI(singleArg);
- } else if (cmd == m_setSetupNameCmd) {
+ } else if (cmd == _setSetupNameCmd) {
parser->setSetupName(singleArg);
- } else if (cmd == m_setVersionCmd) {
+ } else if (cmd == _setVersionCmd) {
parser->setVersion(singleArg);
- } else if (cmd == m_setupCmd) {
+ } else if (cmd == _setupCmd) {
G4String uri, setup, version; is >> uri >> setup >> version;
@@ -48,14 +48,14 @@
parser->setURI(uri); parser->setSetupName(setup); parser->setVersion(version);
- } else if (cmd == m_dumpCmd) {
+ } else if (cmd == _dumpCmd) {
//std::cout<<"arg: "<<singleArg<<std::endl; NistElementsDump::writeXml(singleArg);
- } else if (cmd == m_checkOverlapsCmd || cmd == m_checkOverlapsRecurseCmd) {
+ } else if (cmd == _checkOverlapsCmd || cmd == _checkOverlapsRecurseCmd) {
bool recurse = false;
- if (cmd == m_checkOverlapsRecurseCmd) {
+ if (cmd == _checkOverlapsRecurseCmd) {
recurse = true; }
@@ -85,72 +85,72 @@
G4UIparameter *p; // LCDD directory
- m_lcddDir = new G4UIdirectory("/lcdd/");
- m_lcddDir->SetGuidance(
+ _lcddDir = new G4UIdirectory("/lcdd/");
+ _lcddDir->SetGuidance(
"XML detector description and geometry commands. [LCDD]"); // set URL for input geometry file
- m_setURICmd = new G4UIcommand("/lcdd/url", this);
- m_setURICmd->SetGuidance(
+ _setURICmd = new G4UIcommand("/lcdd/url", this);
+ _setURICmd->SetGuidance(
"Set the Uniform Resource Locator (URL) for the input geometry file.");
- m_setURICmd->AvailableForStates(G4State_PreInit);
+ _setURICmd->AvailableForStates(G4State_PreInit);
p = new G4UIparameter("URI", 's', false);
- m_setURICmd->SetParameter(p);
+ _setURICmd->SetParameter(p);
// set name of GDML setup
- m_setSetupNameCmd = new G4UIcommand("/lcdd/setupName", this);
- m_setSetupNameCmd->SetGuidance("Set GDML setup name.");
- m_setSetupNameCmd->AvailableForStates(G4State_PreInit);
+ _setSetupNameCmd = new G4UIcommand("/lcdd/setupName", this);
+ _setSetupNameCmd->SetGuidance("Set GDML setup name.");
+ _setSetupNameCmd->AvailableForStates(G4State_PreInit);
p = new G4UIparameter("SetupName", 's', false);
- m_setSetupNameCmd->SetParameter(p);
+ _setSetupNameCmd->SetParameter(p);
// set version of GDML setup
- m_setVersionCmd = new G4UIcommand("/lcdd/version", this);
- m_setVersionCmd->SetGuidance("Set GDML version tag.");
- m_setVersionCmd->AvailableForStates(G4State_PreInit);
+ _setVersionCmd = new G4UIcommand("/lcdd/version", this);
+ _setVersionCmd->SetGuidance("Set GDML version tag.");
+ _setVersionCmd->AvailableForStates(G4State_PreInit);
p = new G4UIparameter("Version", 's', false);
- m_setVersionCmd->SetParameter(p);
+ _setVersionCmd->SetParameter(p);
// setup URI, Setup and Version in one command
- m_setupCmd = new G4UIcommand("/lcdd/setup", this);
- m_setupCmd->SetGuidance(
+ _setupCmd = new G4UIcommand("/lcdd/setup", this);
+ _setupCmd->SetGuidance(
"Set URI, SetupName and Version with a single command.");
- m_setupCmd->AvailableForStates(G4State_PreInit);
+ _setupCmd->AvailableForStates(G4State_PreInit);
p = new G4UIparameter("URI", 's', false);
p->SetGuidance(
"URI is a URL to the input file. It MUST NOT contain unescaped spaces.");
- m_setupCmd->SetParameter(p);
+ _setupCmd->SetParameter(p);
p = new G4UIparameter("SetupName", 's', true);
- m_setupCmd->SetParameter(p);
+ _setupCmd->SetParameter(p);
p = new G4UIparameter("Version", 's', true);
- m_setupCmd->SetParameter(p);
+ _setupCmd->SetParameter(p);
- m_dumpCmd = new G4UIcommand("/lcdd/dumpNistElements", this);
- m_dumpCmd->SetGuidance(
+ _dumpCmd = new G4UIcommand("/lcdd/dumpNistElements", this);
+ _dumpCmd->SetGuidance(
"Dump NIST elements to file as GDML fragment, including lambda and X0.");
p = new G4UIparameter("Filename", 's', true);
p->SetDefaultValue("NistElements.xml");
- m_dumpCmd->SetParameter(p);
+ _dumpCmd->SetParameter(p);
// Check overlaps.
- m_checkOverlapsCmd = new G4UIcommand("/lcdd/checkOverlaps",this);
- m_checkOverlapsCmd->SetGuidance("Call CheckOverlaps on a given volume or the world volume (no arguments).");
+ _checkOverlapsCmd = new G4UIcommand("/lcdd/checkOverlaps",this);
+ _checkOverlapsCmd->SetGuidance("Call CheckOverlaps on a given volume or the world volume (no arguments).");
p = new G4UIparameter("Volume",'s',true);
p->SetDefaultValue("");
- m_checkOverlapsCmd->SetParameter(p);
+ _checkOverlapsCmd->SetParameter(p);
// Check overlaps with recursion to daughters.
- m_checkOverlapsRecurseCmd = new G4UIcommand("/lcdd/checkOverlapsRecurse",this);
- m_checkOverlapsRecurseCmd->SetGuidance("Call CheckOverlaps on a given volume and recursively check daughters.");
+ _checkOverlapsRecurseCmd = new G4UIcommand("/lcdd/checkOverlapsRecurse",this);
+ _checkOverlapsRecurseCmd->SetGuidance("Call CheckOverlaps on a given volume and recursively check daughters.");
p = new G4UIparameter("Volume",'s',true);
p->SetDefaultValue("");
- m_checkOverlapsRecurseCmd->SetParameter(p);
+ _checkOverlapsRecurseCmd->SetParameter(p);
}
diff -u -r1.3 -r1.4 --- LCDDParser.cc 2 Jul 2013 21:19:44 -0000 1.3 +++ LCDDParser.cc 10 Jul 2013 16:49:47 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/core/LCDDParser.cc,v 1.3 2013/07/02 21:19:44 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/core/LCDDParser.cc,v 1.4 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/core/LCDDParser.hh"
@@ -17,20 +17,20 @@
extern "C" void LCDDLibLoad();
-LCDDParser* LCDDParser::m_instance = 0;
+LCDDParser* LCDDParser::_instance = 0;
LCDDParser::LCDDParser() :
- m_URI(""), m_setupName(""), m_version(""), m_initialized(false), m_constructed(false), m_setURI(false)
+ _URI(""), _setupName(""), _version(""), _initialized(false), _constructed(false), _setURI(false)
{
}
LCDDParser* LCDDParser::instance()
{
- if (m_instance == 0) {
- m_instance = new LCDDParser();
+ if (_instance == 0) {
+ _instance = new LCDDParser();
}
- return m_instance;
+ return _instance;
} LCDDParser::~LCDDParser()
@@ -40,29 +40,29 @@
void LCDDParser::setupParserConfig()
{
- setupParserConfig(m_URI, m_setupName, m_version);
+ setupParserConfig(_URI, _setupName, _version);
}
void LCDDParser::setupParserConfig(const std::string& URI, const std::string&, const std::string& version)
{
// settings from messenger commands
- std::cout << "LCDD URI <" << m_URI << ">" << std::endl;
+ std::cout << "LCDD URI <" << _URI << ">" << std::endl;
//std::cout << "SetupName <" << m_setupName << ">" << std::endl;
- std::cout << "Version <" << m_version << ">" << std::endl;
+ std::cout << "Version <" << _version << ">" << std::endl;
// set configuration vals
- m_config.SetURI(URI);
+ _config.SetURI(URI);
//m_config.SetSetupName(setupName);
- m_config.SetSetupVersion(version);
+ _config.SetSetupVersion(version);
// set config in parser
- m_sxp.Configure(&m_config);
+ _sxp.Configure(&_config);
}
void LCDDParser::initializeParser()
{
// standard SAX parser init
- m_sxp.Initialize();
+ _sxp.Initialize();
// load custom LCDD tag handlers
LCDDLibLoad();
@@ -72,15 +72,15 @@
void LCDDParser::initialize()
{
- if (!m_initialized) {
+ if (!_initialized) {
initializeParser();
- m_initialized = true;
+ _initialized = true;
}
}
G4VPhysicalVolume* LCDDParser::construct()
{
- if (!m_constructed) {
+ if (!_constructed) {
// initialize
initialize();
@@ -89,11 +89,11 @@
setupParserConfig();
// run the parser
- m_sxp.Run();
+ _sxp.Run();
// get world volume from GDML
try {
- m_world = (G4VPhysicalVolume*) GDMLProcessor::GetInstance()->GetWorldVolume();
+ _world = (G4VPhysicalVolume*) GDMLProcessor::GetInstance()->GetWorldVolume();
} catch (std::exception& e) {
G4Exception("", "", FatalException, "Failed to get the world volume.");
}
@@ -102,55 +102,55 @@
FieldManager::instance()->setup();
// This method should only be called once.
- m_constructed = true;
+ _constructed = true;
} else {
std::cerr << "LCDD geometry was already constructed." << std::endl;
}
- return m_world;
+ return _world;
}
void LCDDParser::finalize()
{
- m_sxp.Finalize();
+ _sxp.Finalize();
}
void LCDDParser::setURI(std::string URI)
{
- m_URI = URI; - m_setURI = true;
+ _URI = URI; + _setURI = true;
}
void LCDDParser::setSetupName(std::string setupName)
{
- m_setupName = setupName;
+ _setupName = setupName;
}
void LCDDParser::setVersion(std::string version)
{
- m_version = version;
+ _version = version;
}
const std::string& LCDDParser::URI()
{
- return m_URI;
+ return _URI;
}
const std::string& LCDDParser::setupName()
{
- return m_setupName;
+ return _setupName;
}
const std::string& LCDDParser::version()
{
- return m_version;
+ return _version;
}
bool LCDDParser::isValidSetup()
{
bool valid = true;
- if (!m_setURI) {
+ if (!_setURI) {
valid = false;
}
@@ -161,7 +161,7 @@
{
RCObjectHandle<SAXSubscriber> obj;
obj = new volumeExtendedSubscriber();
- SAXSubscriberPool* pool = const_cast<SAXSubscriberPool*>(m_sxp.GetSubscriberPool());
+ SAXSubscriberPool* pool = const_cast<SAXSubscriberPool*>(_sxp.GetSubscriberPool());
pool->AddSubscriber("volume", obj);
}
diff -u -r1.2 -r1.3 --- LCDDProcessor.cc 1 Jul 2013 21:00:44 -0000 1.2 +++ LCDDProcessor.cc 10 Jul 2013 16:49:47 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/core/LCDDProcessor.cc,v 1.2 2013/07/01 21:00:44 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/core/LCDDProcessor.cc,v 1.3 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/core/LCDDProcessor.hh"
@@ -13,38 +13,38 @@
#include "G4SDManager.hh" #include "G4HCtable.hh"
-LCDDProcessor* LCDDProcessor::sInstance = 0;
+LCDDProcessor* LCDDProcessor::_instance = 0;
LCDDProcessor::LCDDProcessor() :
- m_header(0)
+ _header(0)
{
}
LCDDProcessor::~LCDDProcessor()
{
- if (m_header != 0) {
- delete m_header;
+ if (_header != 0) {
+ delete _header;
}
}
LCDDProcessor* LCDDProcessor::instance()
{
- if (sInstance == 0) {
- sInstance = new LCDDProcessor;
+ if (_instance == 0) {
+ _instance = new LCDDProcessor;
}
- return sInstance;
+ return _instance;
}
void LCDDProcessor::addSensitiveDetector(std::string& name, SensitiveDetector* sd)
{
//std::cout << "adding SD: " << name << std::endl;
- m_sensitiveDetectors[name] = sd;
+ _sensitiveDetectors[name] = sd;
}
SensitiveDetector* LCDDProcessor::getSensitiveDetector(const std::string& name)
{
- return m_sensitiveDetectors[name];
+ return _sensitiveDetectors[name];
} SensitiveDetector* LCDDProcessor::getSensitiveDetector(const char* name)
@@ -55,17 +55,17 @@
LCDDProcessor::SensitiveDetectors::const_iterator LCDDProcessor::getSensitiveDetectorsBegin()
{
- return m_sensitiveDetectors.begin();
+ return _sensitiveDetectors.begin();
}
LCDDProcessor::SensitiveDetectors::const_iterator LCDDProcessor::getSensitiveDetectorsEnd()
{
- return m_sensitiveDetectors.end();
+ return _sensitiveDetectors.end();
}
void LCDDProcessor::addMagneticField(std::string& name, G4MagneticField* mag)
{
- m_magneticFields[name] = mag;
+ _magneticFields[name] = mag;
} void LCDDProcessor::addGlobalField(G4MagneticField* mag)
@@ -75,7 +75,7 @@
G4MagneticField* LCDDProcessor::getMagneticField(const std::string& name)
{
- return m_magneticFields[name];
+ return _magneticFields[name];
} G4MagneticField* LCDDProcessor::getMagneticField(const char* name)
@@ -86,22 +86,22 @@
LCDDProcessor::MagneticFields::const_iterator LCDDProcessor::getMagneticFieldsBegin()
{
- return m_magneticFields.begin();
+ return _magneticFields.begin();
}
LCDDProcessor::MagneticFields::const_iterator LCDDProcessor::getMagneticFieldsEnd()
{
- return m_magneticFields.end();
+ return _magneticFields.end();
}
void LCDDProcessor::addRegion(std::string& name, G4Region* reg)
{
- m_regions[name] = reg;
+ _regions[name] = reg;
}
G4Region* LCDDProcessor::getRegion(const std::string& name)
{
- return m_regions[name];
+ return _regions[name];
} G4Region* LCDDProcessor::getRegion(const char* name)
@@ -112,22 +112,22 @@
LCDDProcessor::Regions::const_iterator LCDDProcessor::getRegionsBegin()
{
- return m_regions.begin();
+ return _regions.begin();
}
LCDDProcessor::Regions::const_iterator LCDDProcessor::getRegionsEnd()
{
- return m_regions.end();
+ return _regions.end();
}
void LCDDProcessor::addVisAttributes(std::string& name, G4VisAttributes* vis)
{
- m_visAttributes[name] = vis;
+ _visAttributes[name] = vis;
}
G4VisAttributes* LCDDProcessor::getVisAttributes(const std::string& name)
{
- return m_visAttributes[name];
+ return _visAttributes[name];
} G4VisAttributes* LCDDProcessor::getVisAttributes(const char* name)
@@ -138,22 +138,22 @@
LCDDProcessor::VisAttributes::const_iterator LCDDProcessor::getVisAttributesBegin()
{
- return m_visAttributes.begin();
+ return _visAttributes.begin();
}
LCDDProcessor::VisAttributes::const_iterator LCDDProcessor::getVisAttributesEnd()
{
- return m_visAttributes.end();
+ return _visAttributes.end();
}
void LCDDProcessor::addLimitSet(std::string& name, PhysicsLimitSet* lim)
{
- m_limitSets[name] = lim;
+ _limitSets[name] = lim;
}
PhysicsLimitSet* LCDDProcessor::getLimitSet(const std::string& name)
{
- return m_limitSets[name];
+ return _limitSets[name];
} PhysicsLimitSet* LCDDProcessor::getLimitSet(const char* name)
@@ -164,57 +164,57 @@
LCDDProcessor::LimitSets::const_iterator LCDDProcessor::getLimitSetsBegin()
{
- return m_limitSets.begin();
+ return _limitSets.begin();
}
LCDDProcessor::LimitSets::const_iterator LCDDProcessor::getLimitSetsEnd()
{
- return m_limitSets.end();
+ return _limitSets.end();
}
const LCDDHeaderRecord* LCDDProcessor::getHeader() const
{
- return m_header;
+ return _header;
}
void LCDDProcessor::setHeader(LCDDHeaderRecord* h)
{
assert(h);
- m_header = h;
+ _header = h;
}
std::string LCDDProcessor::getDetectorName() const
{
std::string detTag;
- if (m_header == 0) {
+ if (_header == 0) {
detTag = "UNKNOWN";
} else {
- detTag = m_header->getDetectorName();
+ detTag = _header->getDetectorName();
}
return detTag;
}
const LCDDProcessor::VisAttributes* LCDDProcessor::getVisAttributesStore() const
{
- return &m_visAttributes;
+ return &_visAttributes;
}
const LCDDProcessor::SensitiveDetectors* LCDDProcessor::getSensitiveDetectorStore() const
{
- return &m_sensitiveDetectors;
+ return &_sensitiveDetectors;
}
const LCDDProcessor::MagneticFields* LCDDProcessor::getMagneticFieldStore() const
{
- return &m_magneticFields;
+ return &_magneticFields;
}
const LCDDProcessor::Regions* LCDDProcessor::getRegionStore() const
{
- return &m_regions;
+ return &_regions;
}
const LCDDProcessor::LimitSets* LCDDProcessor::getLimitSetStore() const
{
- return &m_limitSets;
+ return &_limitSets;
}
diff -u -r1.3 -r1.4 --- CalorimeterSD.cc 3 Jul 2013 23:00:46 -0000 1.3 +++ CalorimeterSD.cc 10 Jul 2013 16:49:47 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/CalorimeterSD.cc,v 1.3 2013/07/03 23:00:46 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/CalorimeterSD.cc,v 1.4 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/detectors/CalorimeterSD.hh"
@@ -23,34 +23,34 @@
using std::vector; CalorimeterSD::CalorimeterSD(G4String sdName, G4String hcName, Segmentation* sdSeg, HitComparator* compare) :
- SensitiveDetector(sdName, hcName, SensitiveDetector::eCalorimeter), m_segmentation(sdSeg)
+ SensitiveDetector(sdName, hcName, SensitiveDetector::eCalorimeter), _segmentation(sdSeg)
{
- m_hitsCollections.push_back(m_collection); - m_hits.clear(); - hits_vector.clear(); - hits_vector.push_back(m_hits);
+ _hitsCollections.push_back(_collection); + _hits.clear(); + _hitsVector.clear(); + _hitsVector.push_back(_hits);
if (compare == 0)
- m_hitCompare = new PositionComparator();
+ _hitCompare = new PositionComparator();
else
- m_hitCompare = compare;
+ _hitCompare = compare;
} CalorimeterSD::CalorimeterSD(G4String sdName, const vector<G4String>& hcNames, Segmentation* sdSeg, HitComparator* compare) :
- SensitiveDetector(sdName, hcNames, SensitiveDetector::eCalorimeter), m_segmentation(sdSeg)
+ SensitiveDetector(sdName, hcNames, SensitiveDetector::eCalorimeter), _segmentation(sdSeg)
{
- m_hits.clear(); - hits_vector.clear(); - hits_vector.push_back(m_hits);
+ _hits.clear(); + _hitsVector.clear(); + _hitsVector.push_back(_hits);
for (int i = 0; i < (int) hcNames.size(); i++) {
- hits_vector.push_back(m_hits); - hits_vector[i].clear(); - m_hitsCollections.push_back(m_collection);
+ _hitsVector.push_back(_hits); + _hitsVector[i].clear(); + _hitsCollections.push_back(_collection);
}
if (compare == 0) {
- m_hitCompare = new PositionComparator();
+ _hitCompare = new PositionComparator();
} else {
- m_hitCompare = compare;
+ _hitCompare = compare;
} }
@@ -62,8 +62,8 @@
{
bool valid = SensitiveDetector::isValidVolume(lv);
- if (valid && m_segmentation != 0) {
- valid = m_segmentation->isValidSolid(lv->GetSolid());
+ if (valid && _segmentation != 0) {
+ valid = _segmentation->isValidSolid(lv->GetSolid());
}
return valid;
@@ -75,7 +75,7 @@
// new cal hits collection
for (int i = 0; i < getNumberOfHitsCollections(); i++) {
- m_hitsCollections[i] = new G4CalorimeterHitsCollection(GetName(), collectionName[i]);
+ _hitsCollections[i] = new G4CalorimeterHitsCollection(GetName(), collectionName[i]);
// set HCID
if (getHCID(i) < 0) {
@@ -83,13 +83,13 @@
}
// add collection to HC of event
- HCE->AddHitsCollection(getHCID(i), m_hitsCollections[i]);
+ HCE->AddHitsCollection(getHCID(i), _hitsCollections[i]);
}
}
Segmentation* CalorimeterSD::getSegmentation() const
{
- return m_segmentation;
+ return _segmentation;
} G4bool CalorimeterSD::ProcessHits(G4Step* aStep, G4TouchableHistory*)
@@ -119,13 +119,13 @@
}
// Get global cell pos from segmentation.
- G4ThreeVector globalCellPos = m_segmentation->getGlobalHitPos(aStep);
+ G4ThreeVector globalCellPos = _segmentation->getGlobalHitPos(aStep);
// Reset the segmentation bin values.
- m_segmentation->resetBins();
+ _segmentation->resetBins();
// Set the segmentation bin values from the step.
- m_segmentation->setBins(aStep);
+ _segmentation->setBins(aStep);
// Create a 64-bit ID.
Id64bit id64 = makeId();
@@ -153,10 +153,10 @@
}
#endif
// add it to lkp map
- hits_vector[0].push_back(thisHit);
+ _hitsVector[0].push_back(thisHit);
// add to the HC
- m_hitsCollections[0]->insert(thisHit);
+ _hitsCollections[0]->insert(thisHit);
}
// found a hit
else {
@@ -187,8 +187,8 @@
CalorimeterHit* CalorimeterSD::findHit(CalorimeterHit* aHit) const
{
CalorimeterHit* fndHit = 0;
- for (CalorimeterHitList::const_iterator iter = hits_vector[0].begin(); iter != hits_vector[0].end(); iter++) {
- if (m_hitCompare->compare(**iter, *aHit)) {
+ for (CalorimeterHitList::const_iterator iter = _hitsVector[0].begin(); iter != _hitsVector[0].end(); iter++) {
+ if (_hitCompare->compare(**iter, *aHit)) {
fndHit = *iter;
break;
}
@@ -199,8 +199,8 @@
CalorimeterHit* CalorimeterSD::findHit(CalorimeterHit* aHit, G4int nHC) const
{
CalorimeterHit* fndHit = 0;
- for (CalorimeterHitList::const_iterator iter = hits_vector[nHC].begin(); iter != hits_vector[nHC].end(); iter++) {
- if (m_hitCompare->compare(**iter, *aHit)) {
+ for (CalorimeterHitList::const_iterator iter = _hitsVector[nHC].begin(); iter != _hitsVector[nHC].end(); iter++) {
+ if (_hitCompare->compare(**iter, *aHit)) {
fndHit = *iter;
break;
}
@@ -212,7 +212,7 @@
{
for (int i = 0; i < getNumberOfHitsCollections(); i++) {
os << getHitsCollection(i)->GetName() << std::endl;
- for (CalorimeterHitList::const_iterator iter = hits_vector[i].begin(); iter != hits_vector[i].end(); iter++) {
+ for (CalorimeterHitList::const_iterator iter = _hitsVector[i].begin(); iter != _hitsVector[i].end(); iter++) {
os << " " << **iter;
}
}
@@ -232,9 +232,9 @@
std::ostream& CalorimeterSD::printBasicInfo(std::ostream& os)
{
SensitiveDetector::printBasicInfo(os);
- os << "segmentation type: " << m_segmentation->getTypeString() << std::endl;
+ os << "segmentation type: " << _segmentation->getTypeString() << std::endl;
os << "segmentation bins:";
- for (std::vector<std::string>::const_iterator it = m_segmentation->getBinNames().begin(); it != m_segmentation->getBinNames().end(); it++) {
+ for (std::vector<std::string>::const_iterator it = _segmentation->getBinNames().begin(); it != _segmentation->getBinNames().end(); it++) {
os << " " << *it;
}
os << std::endl;
@@ -244,7 +244,7 @@
double CalorimeterSD::getEdep() const
{
double edep = 0.0;
- for (CalorimeterHitList::const_iterator it = hits_vector[0].begin(); it != hits_vector[0].end(); it++) {
+ for (CalorimeterHitList::const_iterator it = _hitsVector[0].begin(); it != _hitsVector[0].end(); it++) {
edep += (*it)->getEdep();
}
return edep;
@@ -253,7 +253,7 @@
double CalorimeterSD::getEdep(G4int nHC) const
{
double edep = 0.0;
- for (CalorimeterHitList::const_iterator it = hits_vector[nHC].begin(); it != hits_vector[nHC].end(); it++) {
+ for (CalorimeterHitList::const_iterator it = _hitsVector[nHC].begin(); it != _hitsVector[nHC].end(); it++) {
edep += (*it)->getEdep();
}
return edep;
@@ -262,17 +262,17 @@
void CalorimeterSD::clearHits()
{
for (int i = 0; i < getNumberOfHitsCollections(); i++) {
- hits_vector[i].clear();
+ _hitsVector[i].clear();
}
}
CalorimeterSD::CalorimeterHitList CalorimeterSD::getCalorimeterHitList()
{
- return hits_vector[0];
+ return _hitsVector[0];
}
CalorimeterSD::CalorimeterHitList CalorimeterSD::getCalorimeterHitList(G4int nHC)
{
- return hits_vector[nHC];
+ return _hitsVector[nHC];
}
diff -u -r1.1 -r1.2 --- CellReadout.cc 26 Jun 2013 23:51:00 -0000 1.1 +++ CellReadout.cc 10 Jul 2013 16:49:47 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/CellReadout.cc,v 1.1 2013/06/26 23:51:00 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/CellReadout.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
#include "lcdd/detectors/CellReadout.hh"
@@ -15,5 +15,5 @@
*/
const CellReadout::FieldNames& CellReadout::fieldNames()
{
- return m_fieldNames;
+ return _fieldNames;
}
diff -u -r1.1 -r1.2 --- CellReadout2D.cc 26 Jun 2013 23:51:00 -0000 1.1 +++ CellReadout2D.cc 10 Jul 2013 16:49:47 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/CellReadout2D.cc,v 1.1 2013/06/26 23:51:00 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/CellReadout2D.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/detectors/CellReadout2D.hh"
@@ -10,11 +10,11 @@
CellReadout2D::CellReadout2D(double cellSizeX, double cellSizeY)
{
- m_cellSizeX = cellSizeX; - m_cellSizeY = cellSizeY;
+ _cellSizeX = cellSizeX; + _cellSizeY = cellSizeY;
- m_fieldNames.push_back("ix");
- m_fieldNames.push_back("iy");
+ _fieldNames.push_back("ix");
+ _fieldNames.push_back("iy");
} CellReadout2D::~CellReadout2D()
@@ -112,22 +112,22 @@
double CellReadout2D::getCellSizeX()
{
- return m_cellSizeX;
+ return _cellSizeX;
}
double CellReadout2D::getCellSizeY()
{
- return m_cellSizeY;
+ return _cellSizeY;
}
int CellReadout2D::getXIndex(double x)
{
- return getCellIndex(x, m_cellSizeX);
+ return getCellIndex(x, _cellSizeX);
}
int CellReadout2D::getYIndex(double y)
{
- return getCellIndex(y, m_cellSizeY);
+ return getCellIndex(y, _cellSizeY);
} double CellReadout2D::getCellCoordinate(int i, double cellSize)
@@ -150,12 +150,12 @@
double CellReadout2D::getCellPositionX(int ix)
{
- return getCellCoordinate(ix, m_cellSizeX);
+ return getCellCoordinate(ix, _cellSizeX);
}
double CellReadout2D::getCellPositionY(int iy)
{
- return getCellCoordinate(iy, m_cellSizeY);
+ return getCellCoordinate(iy, _cellSizeY);
} CellReadout2D::CellId CellReadout2D::createCell(int x, int y)
diff -u -r1.2 -r1.3 --- CellReadout2DSegmentation.cc 1 Jul 2013 21:00:44 -0000 1.2 +++ CellReadout2DSegmentation.cc 10 Jul 2013 16:49:47 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/CellReadout2DSegmentation.cc,v 1.2 2013/07/01 21:00:44 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/CellReadout2DSegmentation.cc,v 1.3 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/detectors/CellReadout2DSegmentation.hh"
@@ -14,13 +14,13 @@
CellReadout2DSegmentation::CellReadout2DSegmentation(double cellSizeX, double cellSizeY) :
Segmentation(Segmentation::eNonprojective, 2)
{
- m_readout = new CellReadout2D(cellSizeX, cellSizeY);
+ _readout = new CellReadout2D(cellSizeX, cellSizeY);
setBinNames();
}
CellReadout2DSegmentation::~CellReadout2DSegmentation()
{
- delete m_readout;
+ delete _readout;
} G4ThreeVector CellReadout2DSegmentation::getGlobalHitPos(const G4Step* aStep)
@@ -47,7 +47,7 @@
//= m_readout->localToReadoutCoordinates(localXY);
// Get the cell for the position.
- CellReadout2D::CellId cell = m_readout->cellId(xy);
+ CellReadout2D::CellId cell = _readout->cellId(xy);
// Set bin values.
this->setBin(0, xy.first);
diff -u -r1.1 -r1.2 --- Cerenkov.cc 26 Jun 2013 23:51:00 -0000 1.1 +++ Cerenkov.cc 10 Jul 2013 16:49:47 -0000 1.2 @@ -79,9 +79,9 @@
G4cout << "Cerenkov angle Integrals: " << G4endl;
G4cout << "=========================" << G4endl;
CerAngleIntegrals->DumpValues();
- CAI.push_back(aMaterial->GetName()); - CerenkovAngleIntegrals.push_back(CerAngleIntegrals); - RefractionIndeces.push_back(theRefractionIndexVector);
+ _CAI.push_back(aMaterial->GetName()); + _cerenkovAngleIntegrals.push_back(CerAngleIntegrals); + _refractionIndeces.push_back(theRefractionIndexVector);
}
}
}
@@ -99,8 +99,8 @@
//
// check if optical properties are defined for this material:
//
- for (unsigned int ii = 0; ii < CAI.size(); ii++) {
- if (CAI[ii] == Material) {
+ for (unsigned int ii = 0; ii < _CAI.size(); ii++) {
+ if (_CAI[ii] == Material) {
MaterialIndex = ii;
Ceren = true;
break;
@@ -116,15 +116,15 @@
G4double BetaInverse = 1. / beta;
// Min and Max photon energies
- G4double Pmin = RefractionIndeces[MaterialIndex]->GetMinLowEdgeEnergy(); - G4double Pmax = RefractionIndeces[MaterialIndex]->GetMaxLowEdgeEnergy();
+ G4double Pmin = _refractionIndeces[MaterialIndex]->GetMinLowEdgeEnergy(); + G4double Pmax = _refractionIndeces[MaterialIndex]->GetMaxLowEdgeEnergy();
// Min and Max Refraction Indices
- G4double nMin = RefractionIndeces[MaterialIndex]->GetMinValue(); - G4double nMax = RefractionIndeces[MaterialIndex]->GetMaxValue();
+ G4double nMin = _refractionIndeces[MaterialIndex]->GetMinValue(); + G4double nMax = _refractionIndeces[MaterialIndex]->GetMaxValue();
// Max Cerenkov Angle Integral
- G4double CAImax = CerenkovAngleIntegrals[MaterialIndex]->GetMaxValue();
+ G4double CAImax = _cerenkovAngleIntegrals[MaterialIndex]->GetMaxValue();
G4double dp, ge;
// If n(Pmax) < 1/Beta -- no photons generated
@@ -144,13 +144,13 @@
// the GetValue() method of G4PhysicsVector.
else {
- Pmin = RefractionIndeces[MaterialIndex]->GetEnergy(BetaInverse);
+ Pmin = _refractionIndeces[MaterialIndex]->GetEnergy(BetaInverse);
dp = Pmax - Pmin;
// need boolean for current implementation of G4PhysicsVector
// ==> being phased out
G4bool isOutRange;
- G4double CAImin = CerenkovAngleIntegrals[MaterialIndex]->GetValue(Pmin, isOutRange);
+ G4double CAImin = _cerenkovAngleIntegrals[MaterialIndex]->GetValue(Pmin, isOutRange);
ge = CAImax - CAImin;
}
diff -u -r1.2 -r1.3 --- OpticalCalorimeterSD.cc 3 Jul 2013 23:00:46 -0000 1.2 +++ OpticalCalorimeterSD.cc 10 Jul 2013 16:49:47 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/OpticalCalorimeterSD.cc,v 1.2 2013/07/03 23:00:46 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/OpticalCalorimeterSD.cc,v 1.3 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/detectors/OpticalCalorimeterSD.hh"
@@ -84,9 +84,9 @@
// get global cell pos from seg
G4ThreeVector globalCellPos = getGlobalHitPosPreStep(apreStepPoint);
// reset the seg bins
- m_segmentation->resetBins();
+ _segmentation->resetBins();
// set the seg bins
- m_segmentation->setBins(aStep);
+ _segmentation->setBins(aStep);
// create id and pack into 64
Id64bit id64 = makeId();
// find hit by simple lkp of new hit with above info
@@ -96,9 +96,9 @@
// hit is not found?
if (!(fndHit = findHit(thisHit, eCerenkov))) {
// add it to lkp map
- hits_vector[eCerenkov].push_back(thisHit);
+ _hitsVector[eCerenkov].push_back(thisHit);
// add to the HC
- m_hitsCollections[eCerenkov]->insert(thisHit);
+ _hitsCollections[eCerenkov]->insert(thisHit);
} else {
// found a hit
// don't need to insert thisHit, so delete it
diff -u -r1.2 -r1.3 --- ScorerSD.cc 3 Jul 2013 20:03:49 -0000 1.2 +++ ScorerSD.cc 10 Jul 2013 16:49:47 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/ScorerSD.cc,v 1.2 2013/07/03 20:03:49 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/ScorerSD.cc,v 1.3 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/detectors/ScorerSD.hh"
@@ -86,7 +86,7 @@
trkHit->setLength(ReadoutUtil::computeDistance(aStep));
// add to HC
- m_HC->insert(trkHit);
+ _HC->insert(trkHit);
} else {
#ifdef G4VERBOSE
if ( m_verbose > 0 ) {
diff -u -r1.3 -r1.4 --- Segmentation.cc 9 Jul 2013 18:51:54 -0000 1.3 +++ Segmentation.cc 10 Jul 2013 16:49:47 -0000 1.4 @@ -1,14 +1,14 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/Segmentation.cc,v 1.3 2013/07/09 18:51:54 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/Segmentation.cc,v 1.4 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/detectors/Segmentation.hh" #include "lcdd/detectors/ReadoutUtil.hh" Segmentation::Segmentation(EType segType, int nbins) :
- m_numBins(nbins), m_type(segType)
+ _numBins(nbins), _type(segType)
{
// reserve nbins
- m_bins.reserve(m_numBins);
+ _bins.reserve(_numBins);
// fill in 0 vals
resetBins();
@@ -20,22 +20,22 @@
void Segmentation::setBin(int binIdx, int binVal)
{
- m_bins.insert(m_bins.begin() + binIdx, binVal);
+ _bins.insert(_bins.begin() + binIdx, binVal);
}
int Segmentation::getNumberOfBins()
{
- return m_numBins;
+ return _numBins;
}
const std::vector<int>& Segmentation::getBins()
{
- return m_bins;
+ return _bins;
}
Segmentation::EType Segmentation::getType()
{
- return m_type;
+ return _type;
} //G4ThreeVector Segmentation::getGlobalHitPos(const G4Step* aStep)
@@ -56,7 +56,7 @@
void Segmentation::resetBins()
{
- m_bins.clear();
+ _bins.clear();
} void Segmentation::printOutBins(std::ostream& os, const std::vector<int>& bins)
@@ -83,9 +83,9 @@
const G4String& Segmentation::getTypeString()
{
static G4String typestr;
- if (m_type == Segmentation::eProjective) {
+ if (_type == Segmentation::eProjective) {
typestr = "Projective";
- } else if (m_type == Segmentation::eNonprojective) {
+ } else if (_type == Segmentation::eNonprojective) {
typestr = "Nonprojective";
} else {
typestr = "Unknown";
@@ -95,28 +95,28 @@
int Segmentation::getBin(int idx)
{
- return m_bins.at(idx);
+ return _bins.at(idx);
}
const std::string& Segmentation::getBinName(int idx)
{
- return m_binNames.at(idx);
+ return _binNames.at(idx);
}
void Segmentation::addBinName(const std::string& binName)
{
- m_binNames.push_back(binName);
+ _binNames.push_back(binName);
}
const std::vector<std::string>& Segmentation::getBinNames()
{
- return m_binNames;
+ return _binNames;
}
void Segmentation::printOutBins(std::ostream& os)
{
- printOutBins(os, m_bins);
+ printOutBins(os, _bins);
} int Segmentation::computeBin(double localDim, double gridDim)
diff -u -r1.1 -r1.2 --- SensitiveDetector.cc 1 Jul 2013 21:00:45 -0000 1.1 +++ SensitiveDetector.cc 10 Jul 2013 16:49:47 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/SensitiveDetector.cc,v 1.1 2013/07/01 21:00:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/SensitiveDetector.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/detectors/SensitiveDetector.hh"
@@ -27,7 +27,7 @@
const std::string& SensitiveDetector::noneStr = "none"; SensitiveDetector::SensitiveDetector(G4String sdName, G4String hcName, EType sdType) :
- G4VSensitiveDetector(sdName), m_idspec(0), m_type(sdType)
+ G4VSensitiveDetector(sdName), _idspec(0), _type(sdType)
{
// insert hits collection name into SD's name vector
collectionName.insert(hcName);
@@ -36,29 +36,29 @@
G4SDManager::GetSDMpointer()->AddNewDetector(this);
// Create the command messenger.
- m_messenger = new SensitiveDetectorMessenger(this);
+ _messenger = new SensitiveDetectorMessenger(this);
// Only one HC
- m_hcids.clear(); - m_hcids.push_back(-1);
+ _hcids.clear(); + _hcids.push_back(-1);
} SensitiveDetector::SensitiveDetector(G4String sdName, const vector<G4String>& hcNames, EType sdType) :
- G4VSensitiveDetector(sdName), m_idspec(0), m_type(sdType)
+ G4VSensitiveDetector(sdName), _idspec(0), _type(sdType)
{
- m_hcids.clear();
+ _hcids.clear();
for (int i = 0; i < (int) hcNames.size(); i++) {
// insert hits collection name into SD's name vector
collectionName.insert(hcNames[i]);
- m_hcids.push_back(-1);
+ _hcids.push_back(-1);
}
// register detector with G4SDManager
G4SDManager::GetSDMpointer()->AddNewDetector(this);
// Create the command messenger.
- m_messenger = new SensitiveDetectorMessenger(this);
+ _messenger = new SensitiveDetectorMessenger(this);
} SensitiveDetector::~SensitiveDetector()
@@ -86,9 +86,9 @@
const std::string& SensitiveDetector::getTypeString() const
{
- if (m_type == eTracker) {
+ if (_type == eTracker) {
return trackerStr;
- } else if (m_type == eCalorimeter) {
+ } else if (_type == eCalorimeter) {
return calorimeterStr;
}
return noneStr;
@@ -97,17 +97,17 @@
std::ostream& SensitiveDetector::printBasicInfo(std::ostream& os)
{
os << "name: " << GetName() << std::endl;
- os << "type: " << m_type << std::endl;
+ os << "type: " << _type << std::endl;
os << "hits collection: " << this->getHCName() << std::endl;
- os << "hits collection ID: " << m_hcids[0] << std::endl; - os << "energy cut: " << G4BestUnit(m_ecut, "Energy") << std::endl; - os << "endcap flag: " << m_endcap << std::endl; - os << "verbose level: " << m_verbose << std::endl;
+ os << "hits collection ID: " << _hcids[0] << std::endl; + os << "energy cut: " << G4BestUnit(_ecut, "Energy") << std::endl; + os << "endcap flag: " << _endcap << std::endl; + os << "verbose level: " << _verbose << std::endl;
- if (m_idspec != 0) {
- os << "id spec: " << m_idspec->getName() << std::endl;
+ if (_idspec != 0) {
+ os << "id spec: " << _idspec->getName() << std::endl;
os << "id fields:";
- for (IdSpec::IdFields::const_iterator it = m_idspec->IdFieldsBegin(); it != m_idspec->IdFieldsEnd(); it++) {
+ for (IdSpec::IdFields::const_iterator it = _idspec->IdFieldsBegin(); it != _idspec->IdFieldsEnd(); it++) {
os << " " << (*it)->getLabel();
}
os << std::endl;
diff -u -r1.2 -r1.3 --- SensitiveDetectorMessenger.cc 1 Jul 2013 21:00:45 -0000 1.2 +++ SensitiveDetectorMessenger.cc 10 Jul 2013 16:49:47 -0000 1.3 @@ -1,4 +1,4 @@
-// $Id: SensitiveDetectorMessenger.cc,v 1.2 2013/07/01 21:00:45 jeremy Exp $
+// $Id: SensitiveDetectorMessenger.cc,v 1.3 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/detectors/SensitiveDetectorMessenger.hh"
@@ -11,16 +11,16 @@
#include "G4UIdirectory.hh" #include "G4VSensitiveDetector.hh"
-G4UIdirectory* SensitiveDetectorMessenger::m_detectorsDir = 0;
+G4UIdirectory* SensitiveDetectorMessenger::_detectorsDir = 0;
SensitiveDetectorMessenger::SensitiveDetectorMessenger(SensitiveDetector* detector) :
- m_detector(detector)
+ _detector(detector)
{
- if (m_detectorsDir == 0) {
+ if (_detectorsDir == 0) {
makeDetectorsDir();
}
- defineCommands(m_detector);
+ defineCommands(_detector);
} SensitiveDetectorMessenger::~SensitiveDetectorMessenger()
@@ -30,30 +30,30 @@
void SensitiveDetectorMessenger::SetNewValue(G4UIcommand* cmd, G4String newVals)
{
- if (cmd == m_printInfoCmd) {
- m_detector->printBasicInfo(std::cout);
- } else if (cmd == m_printNHitsCmd) {
- m_detector->printNumberOfHits(std::cout);
- } else if (cmd == m_printTotalEdepCmd) {
- m_detector->printEdep(std::cout);
- } else if (cmd == m_printVolumesCmd) {
- m_detector->printVolumes(std::cout);
- } else if (cmd == m_printHitsCmd) {
- m_detector->printHits(std::cout);
- } else if (cmd == m_verboseCmd) {
- m_detector->setVerbose(m_verboseCmd->GetNewIntValue(newVals));
- } else if (cmd == m_activateCmd) {
- m_detector->Activate(m_activateCmd->GetNewBoolValue(newVals));
- } else if (cmd == m_ecutCmd) {
- m_detector->setEcut(m_ecutCmd->GetNewDoubleValue(newVals));
+ if (cmd == _printInfoCmd) {
+ _detector->printBasicInfo(std::cout);
+ } else if (cmd == _printNHitsCmd) {
+ _detector->printNumberOfHits(std::cout);
+ } else if (cmd == _printTotalEdepCmd) {
+ _detector->printEdep(std::cout);
+ } else if (cmd == _printVolumesCmd) {
+ _detector->printVolumes(std::cout);
+ } else if (cmd == _printHitsCmd) {
+ _detector->printHits(std::cout);
+ } else if (cmd == _verboseCmd) {
+ _detector->setVerbose(_verboseCmd->GetNewIntValue(newVals));
+ } else if (cmd == _activateCmd) {
+ _detector->Activate(_activateCmd->GetNewBoolValue(newVals));
+ } else if (cmd == _ecutCmd) {
+ _detector->setEcut(_ecutCmd->GetNewDoubleValue(newVals));
}
}
void SensitiveDetectorMessenger::makeDetectorsDir()
{
- m_detectorsDir = new G4UIdirectory("/detectors/");
- m_detectorsDir->SetGuidance("Commands for sensitive detectors. [LCDD]");
+ _detectorsDir = new G4UIdirectory("/detectors/");
+ _detectorsDir->SetGuidance("Commands for sensitive detectors. [LCDD]");
} void SensitiveDetectorMessenger::defineCommands(G4VSensitiveDetector* sd)
@@ -65,45 +65,45 @@
const G4String& dirName = G4String("/detectors/" + name + "/");
// Create the sensitive detector's Geant4 macro command directory.
- m_detectorDir = new G4UIdirectory(dirName.c_str());
- m_detectorDir->SetGuidance(G4String("Commands for the sensitive detector " + name).c_str());
+ _detectorDir = new G4UIdirectory(dirName.c_str());
+ _detectorDir->SetGuidance(G4String("Commands for the sensitive detector " + name).c_str());
// Print command.
- m_printInfoCmd = new G4UIcommand(G4String(dirName + "print").c_str(), this);
- m_printInfoCmd->SetGuidance(G4String("Print basic information about the sensitive detector " + name).c_str());
+ _printInfoCmd = new G4UIcommand(G4String(dirName + "print").c_str(), this);
+ _printInfoCmd->SetGuidance(G4String("Print basic information about the sensitive detector " + name).c_str());
// Print number of hits command.
- m_printNHitsCmd = new G4UIcommand(G4String(dirName + "printNumberOfHits").c_str(), this);
- m_printInfoCmd->SetGuidance(G4String("Print the number of hits from the detector " + name).c_str());
+ _printNHitsCmd = new G4UIcommand(G4String(dirName + "printNumberOfHits").c_str(), this);
+ _printInfoCmd->SetGuidance(G4String("Print the number of hits from the detector " + name).c_str());
// Print energy deposition.
- m_printTotalEdepCmd = new G4UIcommand(G4String(dirName + "printEdep").c_str(), this);
- m_printTotalEdepCmd->SetGuidance(G4String("Print the total energy deposition from the detector " + name).c_str());
+ _printTotalEdepCmd = new G4UIcommand(G4String(dirName + "printEdep").c_str(), this);
+ _printTotalEdepCmd->SetGuidance(G4String("Print the total energy deposition from the detector " + name).c_str());
// Print energy deposition.
- m_printVolumesCmd = new G4UIcommand(G4String(dirName + "printVolumes").c_str(), this);
- m_printVolumesCmd->SetGuidance(G4String("Print a list of logical volume names associated with the detector " + name).c_str());
+ _printVolumesCmd = new G4UIcommand(G4String(dirName + "printVolumes").c_str(), this);
+ _printVolumesCmd->SetGuidance(G4String("Print a list of logical volume names associated with the detector " + name).c_str());
// Print energy deposition.
- m_printHitsCmd = new G4UIcommand(G4String(dirName + "printHits").c_str(), this);
- m_printHitsCmd->SetGuidance(G4String("Print a list of hits from the detector " + name).c_str());
+ _printHitsCmd = new G4UIcommand(G4String(dirName + "printHits").c_str(), this);
+ _printHitsCmd->SetGuidance(G4String("Print a list of hits from the detector " + name).c_str());
// Set the verbosity.
- m_verboseCmd = new G4UIcmdWithAnInteger(G4String(dirName + "setVerbose").c_str(), this);
- m_verboseCmd->SetGuidance(G4String("Set the verbosity of the detector " + name).c_str());
- m_verboseCmd->SetDefaultValue(2);
- m_verboseCmd->SetParameterName("verbose", true, true);
+ _verboseCmd = new G4UIcmdWithAnInteger(G4String(dirName + "setVerbose").c_str(), this);
+ _verboseCmd->SetGuidance(G4String("Set the verbosity of the detector " + name).c_str());
+ _verboseCmd->SetDefaultValue(2);
+ _verboseCmd->SetParameterName("verbose", true, true);
// Activate or deactive this detector.
- m_activateCmd = new G4UIcmdWithABool(G4String(dirName + "setActive").c_str(), this);
- m_activateCmd->SetGuidance(G4String("Set whether the detector " + name + " is active.").c_str());
- m_activateCmd->SetDefaultValue(true);
- m_activateCmd->SetParameterName("active", true, true);
+ _activateCmd = new G4UIcmdWithABool(G4String(dirName + "setActive").c_str(), this);
+ _activateCmd->SetGuidance(G4String("Set whether the detector " + name + " is active.").c_str());
+ _activateCmd->SetDefaultValue(true);
+ _activateCmd->SetParameterName("active", true, true);
// Set the ecut with unit.
- m_ecutCmd = new G4UIcmdWithADoubleAndUnit(G4String(dirName + "setHitEnergyCut").c_str(), this);
- m_ecutCmd->SetGuidance(G4String("Set the single hit energy cut for detector " + name).c_str());
- m_ecutCmd->SetDefaultValue(0.0);
- m_ecutCmd->SetDefaultUnit("GeV");
- m_ecutCmd->SetParameterName("cut", true, true);
+ _ecutCmd = new G4UIcmdWithADoubleAndUnit(G4String(dirName + "setHitEnergyCut").c_str(), this);
+ _ecutCmd->SetGuidance(G4String("Set the single hit energy cut for detector " + name).c_str());
+ _ecutCmd->SetDefaultValue(0.0);
+ _ecutCmd->SetDefaultUnit("GeV");
+ _ecutCmd->SetParameterName("cut", true, true);
}
diff -u -r1.1 -r1.2 --- TrackerCombineSD.cc 1 Jul 2013 21:00:45 -0000 1.1 +++ TrackerCombineSD.cc 10 Jul 2013 16:49:47 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/TrackerCombineSD.cc,v 1.1 2013/07/01 21:00:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/TrackerCombineSD.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/detectors/TrackerCombineSD.hh"
@@ -6,7 +6,7 @@
#include "lcdd/hits/TrackInformation.hh" TrackerCombineSD::TrackerCombineSD(G4String sdName, G4String hcName) :
- TrackerSD(sdName, hcName), m_combineHits(false), m_currentTrackID(-1), m_currentPV(0), m_edepTotal(0), m_minTime(0), m_startedHit(false), m_currentTrack(false)
+ TrackerSD(sdName, hcName), _combineHits(false), _currentTrackID(-1), _currentPV(0), _edepTotal(0), _minTime(0), _startedHit(false), _currentTrack(false)
{
}
@@ -43,17 +43,17 @@
bool r = false;
// Started a hit already?
- if (!m_startedHit) {
+ if (!_startedHit) {
// If no hit, then start a new hit on the pre-step.
startHit(pre());
}
// Check if the cached trackID is valid.
- if (m_currentTrackID != -1) {
+ if (_currentTrackID != -1) {
// Is this step's trackID different from the cached trackID?
- if (trackID() != m_currentTrackID) {
+ if (trackID() != _currentTrackID) {
#ifdef G4VERBOSE
if ( getVerbose() > 0 ) {
@@ -98,7 +98,7 @@
}
// Special case where the track status is StopAndKill.
// If so, we won't see it again, so need to insert the hit.
- else if (m_currentTrack->GetTrackStatus() == fStopAndKill) {
+ else if (_currentTrack->GetTrackStatus() == fStopAndKill) {
r = insertHit();
}
@@ -121,19 +121,19 @@
#endif
// can only update if started hit
- if (m_startedHit) {
+ if (_startedHit) {
// incr edep
- m_edepTotal += edep();
+ _edepTotal += edep();
// first time only
- if (m_minTime == 0) {
- m_minTime = globalTime();
+ if (_minTime == 0) {
+ _minTime = globalTime();
}
// exit point and momentum
- m_exitPoint = postPosition(); - m_exitMomentum = postMomentum();
+ _exitPoint = postPosition(); + _exitMomentum = postMomentum();
} }
@@ -145,11 +145,11 @@
} #endif
- m_minTime = 0; - m_edepTotal = 0; - m_currentPV = 0; - m_currentTrackID = -1; - m_startedHit = false;
+ _minTime = 0; + _edepTotal = 0; + _currentPV = 0; + _currentTrackID = -1; + _startedHit = false;
} bool TrackerCombineSD::insertHit()
@@ -161,16 +161,16 @@
#endif
// never started another hit after clearing
- if (!m_startedHit) {
+ if (!_startedHit) {
G4cerr << "never started hit!" << G4endl;
return false;
}
// total energy below cut
- if ( m_edepTotal <= getEcut() && !isGeantino() ) {
+ if ( _edepTotal <= getEcut() && !isGeantino() ) {
#ifdef G4VERBOSE
if ( getVerbose() > 0 ) {
- std::cout << GetName() << " : cut this edep " << m_edepTotal << std::endl;
+ std::cout << GetName() << " : cut this edep " << _edepTotal << std::endl;
} #endif
@@ -180,22 +180,22 @@
// compute mid point
G4ThreeVector midPoint =
- ReadoutUtil::computeThreeVectorMean(m_entryPoint, m_exitPoint);
+ ReadoutUtil::computeThreeVectorMean(_entryPoint, _exitPoint);
// compute mean momentum
G4ThreeVector meanMom =
- ReadoutUtil::computeThreeVectorMean(m_entryMomentum, m_exitMomentum);
+ ReadoutUtil::computeThreeVectorMean(_entryMomentum, _exitMomentum);
// compute distance from start to entry
- G4double pathlength = ReadoutUtil::computeDistance(m_entryPoint, m_exitPoint);
+ G4double pathlength = ReadoutUtil::computeDistance(_entryPoint, _exitPoint);
// hit data
TrackerHit* trkhit = new TrackerHit();
- trkhit->setTdep(m_minTime); - trkhit->setEdep(m_edepTotal);
+ trkhit->setTdep(_minTime); + trkhit->setEdep(_edepTotal);
trkhit->setPos(midPoint);
trkhit->setMomentum(meanMom);
- trkhit->setTrackID(m_currentTrackID);
+ trkhit->setTrackID(_currentTrackID);
trkhit->setLength(pathlength);
// set id
@@ -206,20 +206,20 @@
if ( getVerbose() > 1 ) {
std::cout << GetName() << " : inserting new tracker hit" << std::endl;
std::cout << *trkhit << std::endl;
- std::cout << "entryPoint = " << m_entryPoint << std::endl; - std::cout << "entryPointR = " << m_entryPoint.mag() << std::endl;
+ std::cout << "entryPoint = " << _entryPoint << std::endl; + std::cout << "entryPointR = " << _entryPoint.mag() << std::endl;
std::cout << "midPoint = " << midPoint << std::endl;
std::cout << "midPointR = " << midPoint.mag() << std::endl;
- std::cout << "exitPoint = " << m_exitPoint << std::endl; - std::cout << "exitPointR = " << m_exitPoint.mag() << std::endl; - std::cout << "(exitPointR - entryPointR) / 2 = " << (m_exitPoint.mag() - m_entryPoint.mag()) / 2 << std::endl;
+ std::cout << "exitPoint = " << _exitPoint << std::endl; + std::cout << "exitPointR = " << _exitPoint.mag() << std::endl; + std::cout << "(exitPointR - entryPointR) / 2 = " << (_exitPoint.mag() - _entryPoint.mag()) / 2 << std::endl;
std::cout << std::endl;
}
#endif
- m_HC->insert(trkhit);
+ _HC->insert(trkhit);
- TrackInformation::getTrackInformation( m_currentTrack )->setHasTrackerHit( true );
+ TrackInformation::getTrackInformation( _currentTrack )->setHasTrackerHit( true );
// clear cached data
clear();
@@ -241,19 +241,19 @@
} #endif
- m_currentTrack = step()->GetTrack(); - m_currentPV = aStepPoint->GetPhysicalVolume(); - m_entryPoint = m_exitPoint = aStepPoint->GetPosition(); - m_entryMomentum = m_exitMomentum = aStepPoint->GetMomentum(); - m_currentTrackID = trackID(); - m_startedHit = true;
+ _currentTrack = step()->GetTrack(); + _currentPV = aStepPoint->GetPhysicalVolume(); + _entryPoint = _exitPoint = aStepPoint->GetPosition(); + _entryMomentum = _exitMomentum = aStepPoint->GetMomentum(); + _currentTrackID = trackID(); + _startedHit = true;
#ifdef G4VERBOSE
if ( getVerbose() > 2 ) {
std::cout << GetName() << " : starting new hit" << std::endl;
- std::cout << "volume = " << m_currentPV->GetName() << std::endl; - std::cout << "trackID = " << m_currentTrackID << std::endl; - std::cout << "entry point = " << m_entryPoint << std::endl;
+ std::cout << "volume = " << _currentPV->GetName() << std::endl; + std::cout << "trackID = " << _currentTrackID << std::endl; + std::cout << "entry point = " << _entryPoint << std::endl;
} #endif }
diff -u -r1.1 -r1.2 --- TrackerSD.cc 1 Jul 2013 21:00:45 -0000 1.1 +++ TrackerSD.cc 10 Jul 2013 16:49:47 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/TrackerSD.cc,v 1.1 2013/07/01 21:00:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/TrackerSD.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/id/IdManager.hh"
@@ -16,9 +16,9 @@
#include <iostream> TrackerSD::TrackerSD(G4String sdName, G4String hcName) :
- SensitiveDetector(sdName, hcName, SensitiveDetector::eTracker), m_HC(0)
+ SensitiveDetector(sdName, hcName, SensitiveDetector::eTracker), _HC(0)
{
- m_hits.clear();
+ _hits.clear();
} TrackerSD::~TrackerSD()
@@ -30,7 +30,7 @@
clearHits();
// create tracker hits coll
- m_HC = new G4TrackerHitsCollection(GetName(), collectionName[0]);
+ _HC = new G4TrackerHitsCollection(GetName(), collectionName[0]);
// set HCID
if (getHCID() < 0) {
@@ -38,7 +38,7 @@
}
// add collection to HC of event
- HCE->AddHitsCollection(getHCID(), m_HC);
+ HCE->AddHitsCollection(getHCID(), _HC);
} G4bool TrackerSD::ProcessHits(G4Step* aStep, G4TouchableHistory*)
@@ -92,16 +92,16 @@
trkHit->setLength(pathLength);
// add to HC
- m_HC->insert(trkHit);
+ _HC->insert(trkHit);
- m_hits.push_back(trkHit);
+ _hits.push_back(trkHit);
return true;
}
std::ostream& TrackerSD::printHits(std::ostream& os)
{
- for (G4TrackerHitList::const_iterator iter = m_hits.begin(); iter != m_hits.end(); iter++) {
+ for (G4TrackerHitList::const_iterator iter = _hits.begin(); iter != _hits.end(); iter++) {
os << (*(const_cast<const TrackerHit*>(*iter)));
}
os << std::endl;
@@ -112,7 +112,7 @@
{
#ifdef G4VERBOSE
if ( getVerbose() > 0 ) {
- std::cout << GetName() << " has " << m_HC->GetSize() << " hits." << std::endl;
+ std::cout << GetName() << " has " << _HC->GetSize() << " hits." << std::endl;
}
if ( getVerbose() > 1 ) {
@@ -124,7 +124,7 @@
double TrackerSD::getEdep() const
{
double edep = 0.0;
- for (G4TrackerHitList::const_iterator it = m_hits.begin(); it != m_hits.end(); it++) {
+ for (G4TrackerHitList::const_iterator it = _hits.begin(); it != _hits.end(); it++) {
edep += (*it)->getEdep();
}
return edep;
@@ -132,10 +132,10 @@
void TrackerSD::clearHits()
{
- m_hits.clear();
+ _hits.clear();
}
TrackerSD::G4TrackerHitList TrackerSD::getTrackerHitList()
{
- return m_hits;
+ return _hits;
}
diff -u -r1.2 -r1.3 --- UnsegmentedCalorimeterSD.cc 3 Jul 2013 23:00:46 -0000 1.2 +++ UnsegmentedCalorimeterSD.cc 10 Jul 2013 16:49:47 -0000 1.3 @@ -1,4 +1,4 @@
-// $Id: UnsegmentedCalorimeterSD.cc,v 1.2 2013/07/03 23:00:46 jeremy Exp $
+// $Id: UnsegmentedCalorimeterSD.cc,v 1.3 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/detectors/UnsegmentedCalorimeterSD.hh"
@@ -56,10 +56,10 @@
thisHit->setId64bit(id64.getId0(), id64.getId1());
/* Add hit to lookup map. */
- hits_vector[0].push_back(thisHit);
+ _hitsVector[0].push_back(thisHit);
/* Add hit to the HC. */
- m_hitsCollections[0]->insert(thisHit);
+ _hitsCollections[0]->insert(thisHit);
/* Add an MCParticle contribution for this hit. */
thisHit->addHitContribution(HitContribution(aStep));
diff -u -r1.2 -r1.3 --- CalorimeterHit.cc 3 Jul 2013 23:00:46 -0000 1.2 +++ CalorimeterHit.cc 10 Jul 2013 16:49:47 -0000 1.3 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/hits/CalorimeterHit.cc,v 1.2 2013/07/03 23:00:46 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/hits/CalorimeterHit.cc,v 1.3 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/hits/CalorimeterHit.hh"
@@ -15,13 +15,13 @@
G4Allocator<CalorimeterHit> G4CalorimeterHitAllocator; CalorimeterHit::CalorimeterHit() :
- G4VHit(), m_edep(0)
+ G4VHit(), _edep(0)
{
;
}
CalorimeterHit::CalorimeterHit(G4double edep, G4ThreeVector globalCellPos) :
- G4VHit(), m_edep(edep), m_pos(globalCellPos)
+ G4VHit(), _edep(edep), _pos(globalCellPos)
{
;
}
@@ -34,21 +34,21 @@
CalorimeterHit::CalorimeterHit(const CalorimeterHit &right) :
G4VHit()
{
- m_edep = right.m_edep; - m_pos = right.m_pos;
+ _edep = right._edep; + _pos = right._pos;
}
const CalorimeterHit& CalorimeterHit::operator=(const CalorimeterHit &right)
{
- m_edep = right.m_edep; - m_pos = right.m_pos;
+ _edep = right._edep; + _pos = right._pos;
return *this;
}
bool CalorimeterHit::operator==(const CalorimeterHit &right)
{
- return (m_pos == right.m_pos);
+ return (_pos == right._pos);
} #ifdef G4VIS_USE
@@ -58,7 +58,7 @@
if(pVVisManager)
{
- G4Point3D p3D = G4Point3D( m_pos );
+ G4Point3D p3D = G4Point3D( _pos );
G4Circle chit(p3D);
chit.SetScreenDiameter(3.0);
chit.SetFillStyle(G4Circle::filled);
@@ -75,7 +75,7 @@
{
printMcpHitContribsHeader(os);
- for (HitContributionList::iterator iter = m_particleList.begin(); iter != m_particleList.end(); iter++) {
+ for (HitContributionList::iterator iter = _particleList.begin(); iter != _particleList.end(); iter++) {
(*iter).printOut(os);
}
}
diff -u -r1.1 -r1.2 --- HitContribution.cc 1 Jul 2013 21:00:45 -0000 1.1 +++ HitContribution.cc 10 Jul 2013 16:49:47 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/hits/HitContribution.cc,v 1.1 2013/07/01 21:00:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/hits/HitContribution.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/hits/HitContribution.hh"
@@ -11,13 +11,13 @@
#include "G4ParticleTypes.hh" HitContribution::HitContribution() :
- m_trackID(-1), m_edep(0), m_PdgId(9999999), m_globalTime(0)
+ _trackID(-1), _edep(0), _PdgId(9999999), _globalTime(0)
{
;
}
HitContribution::HitContribution(G4int trackID, G4double edep, G4int PDGID, G4double globalTime) :
- m_trackID(trackID), m_edep(edep), m_PdgId(PDGID), m_globalTime(globalTime)
+ _trackID(trackID), _edep(edep), _PdgId(PDGID), _globalTime(globalTime)
{
;
}
@@ -36,29 +36,29 @@
TrackInformation* trkInfo = static_cast<TrackInformation*>(aTrack->GetUserInformation());
// Get the track ID.
- m_trackID = trkInfo->getOriginalTrackID();
+ _trackID = trkInfo->getOriginalTrackID();
// Set edep according to type of track.
if (aTrack->GetDefinition() == G4OpticalPhoton::OpticalPhotonDefinition()) {
- m_edep = aTrack->GetTotalEnergy();
+ _edep = aTrack->GetTotalEnergy();
} else {
- m_edep = aStep->GetTotalEnergyDeposit();
+ _edep = aStep->GetTotalEnergyDeposit();
}
// PDG ID.
- m_PdgId = aTrack->GetDefinition()->GetPDGEncoding();
+ _PdgId = aTrack->GetDefinition()->GetPDGEncoding();
// Global time.
- m_globalTime = aTrack->GetGlobalTime();
+ _globalTime = aTrack->GetGlobalTime();
// Compute the step midpoint.
G4ThreeVector posVec = (0.5 * (aStep->GetPreStepPoint()->GetPosition() + aStep->GetPostStepPoint()->GetPosition()));
- m_position[0] = posVec[0]; - m_position[1] = posVec[1]; - m_position[2] = posVec[2];
+ _position[0] = posVec[0]; + _position[1] = posVec[1]; + _position[2] = posVec[2];
}
void HitContribution::printOut(std::ostream& os)
{
- os << m_trackID << '\t' << m_edep << '\t' << m_PdgId << '\t' << m_globalTime << std::endl;
+ os << _trackID << '\t' << _edep << '\t' << _PdgId << '\t' << _globalTime << std::endl;
}
diff -u -r1.1 -r1.2 --- TrackInformation.cc 26 Jun 2013 23:51:00 -0000 1.1 +++ TrackInformation.cc 10 Jul 2013 16:49:47 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/hits/TrackInformation.cc,v 1.1 2013/06/26 23:51:00 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/hits/TrackInformation.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/hits/TrackInformation.hh"
@@ -14,7 +14,7 @@
{
setDefaults();
- m_originalTrackID = aTrack->GetTrackID();
+ _originalTrackID = aTrack->GetTrackID();
} TrackInformation::TrackInformation(const TrackInformation* aTrackInfo)
@@ -37,25 +37,25 @@
void TrackInformation::setDefaults()
{
// default to invalid trackID
- m_originalTrackID = -1;
+ _originalTrackID = -1;
// default to tracking region in both current and orig
- m_originalTrackingStatus = TrackInformation::eInTrackingRegion; - m_trackingStatus = TrackInformation::eInTrackingRegion;
+ _originalTrackingStatus = TrackInformation::eInTrackingRegion; + _trackingStatus = TrackInformation::eInTrackingRegion;
// default flag vals
- m_hasTrackerHit = false; - m_vertexIsNotEndpointOfParent = false; - m_backscatter = false; - m_belowThreshold = false;
+ _hasTrackerHit = false; + _vertexIsNotEndpointOfParent = false; + _backscatter = false; + _belowThreshold = false;
}
void TrackInformation::setFromTrackInformation(const TrackInformation* srcTrkInfo, TrackInformation* trgtTrkInfo)
{
- trgtTrkInfo->setTrackID(srcTrkInfo->m_originalTrackID);
+ trgtTrkInfo->setTrackID(srcTrkInfo->_originalTrackID);
- trgtTrkInfo->setOriginalTrackingStatus(srcTrkInfo->m_originalTrackingStatus); - trgtTrkInfo->setTrackingStatus(srcTrkInfo->m_trackingStatus);
+ trgtTrkInfo->setOriginalTrackingStatus(srcTrkInfo->_originalTrackingStatus); + trgtTrkInfo->setTrackingStatus(srcTrkInfo->_trackingStatus);
trgtTrkInfo->setHasTrackerHit(false);
trgtTrkInfo->setVertexIsNotEndpointOfParent(false);
diff -u -r1.1 -r1.2 --- TrackerHit.cc 1 Jul 2013 21:00:45 -0000 1.1 +++ TrackerHit.cc 10 Jul 2013 16:49:47 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/hits/TrackerHit.cc,v 1.1 2013/07/01 21:00:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/hits/TrackerHit.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/hits/TrackerHit.hh"
@@ -15,7 +15,7 @@
G4Allocator<TrackerHit> G4TrackerHitAllocator; TrackerHit::TrackerHit() :
- G4VHit(), m_edep(0), m_tdep(0), m_trkID(-1), m_length(0)
+ G4VHit(), _edep(0), _tdep(0), _trkID(-1), _length(0)
{
}
diff -u -r1.1 -r1.2 --- IdManager.cc 26 Jun 2013 23:51:01 -0000 1.1 +++ IdManager.cc 10 Jul 2013 16:49:47 -0000 1.2 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/lcdd/id/IdManager.cc,v 1.1 2013/06/26 23:51:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/lcdd/id/IdManager.cc,v 1.2 2013/07/10 16:49:47 jeremy Exp $
// LCDD #include "lcdd/id/IdManager.hh"
@@ -6,7 +6,7 @@
// Geant4 #include "G4LogicalVolume.hh"
-IdManager* IdManager::m_instance = 0;
+IdManager* IdManager::_instance = 0;
IdManager::IdManager()
{
@@ -18,16 +18,16 @@
IdManager* IdManager::instance()
{
- if (m_instance == 0) {
- m_instance = new IdManager;
+ if (_instance == 0) {
+ _instance = new IdManager;
}
- return m_instance;
+ return _instance;
}
void IdManager::addIdSpec(const std::string& name, IdSpec* spec)
{
- m_idSpecs[name] = spec;
+ _idSpecs[name] = spec;
} IdSpec* IdManager::getIdSpec(const char* name)
@@ -38,17 +38,17 @@
IdSpec* IdManager::getIdSpec(const std::string& name)
{
- return m_idSpecs[name];
+ return _idSpecs[name];
}
IdManager::IdSpecs::const_iterator IdManager::getIdSpecsBegin()
{
- return m_idSpecs.begin();
+ return _idSpecs.begin();
}
IdManager::IdSpecs::const_iterator IdManager::getIdSpecsEnd()
{
- return m_idSpecs.end();
+ return _idSpecs.end();
} void IdManager::addPhysVolId(G4LogicalVolume* lvMom, int childIdx, PhysVolId childId)
@@ -68,7 +68,7 @@
//std::cout << "found daughter <" << dau->GetName() << ">" << std::endl;
//std::cout << "dau ptr <" << dau << ">" << std::endl;
- m_physVolIdMap.addPhysVolId(dau, childId);
+ _physVolIdMap.addPhysVolId(dau, childId);
} else {
std::cerr << "IdManager::assignPhysVolId() - childIdx <" << childIdx << "> does not exist!" << std::endl;
}
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1