projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/SensitiveDetector.cc	2014-08-05 23:40:31 UTC (rev 3233)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/SensitiveDetector.cc	2014-08-05 23:55:57 UTC (rev 3234)
@@ -25,16 +25,16 @@

 const std::string& SensitiveDetector::CALORIMETER = "calorimeter";
 const std::string& SensitiveDetector::UNKNOWN = "unknown";
 

-SensitiveDetector::SensitiveDetector(G4String sdName, G4String hcName, EType sdType) :
-        G4VSensitiveDetector(sdName),

+SensitiveDetector::SensitiveDetector(G4String name, G4String collectionName, EType type) :
+        G4VSensitiveDetector(name),

         _idspec(NULL),

-        _type(sdType),

+        _type(type),

         _verbose(false),
         _endcap(false),
         _ecut(0) {
 
     // Insert the collection names into the SD's name vector.

-    collectionNames.insert(hcName);

+    collectionNames.insert(collectionName);

 
     // register detector with G4SDManager
     G4SDManager::GetSDMpointer()->AddNewDetector(this);

@@ -47,16 +47,16 @@

     _hcids.push_back(-1);
 }
 

-SensitiveDetector::SensitiveDetector(G4String sdName, const vector<G4String>& hcNames, EType sdType) :

+SensitiveDetector::SensitiveDetector(G4String sdName, const vector<G4String>& theCollectionNames, EType type) :

         G4VSensitiveDetector(sdName),
         _idspec(0),

-        _type(sdType) {

+        _type(type) {

 
     _hcids.clear(); // Is this needed???
 

-    for (int i = 0; i < (int) hcNames.size(); i++) {

+    for (int i = 0; i < (int) theCollectionNames.size(); i++) {

         // insert hits collection name into SD's name vector

-        collectionNames.insert(hcNames[i]);

+        collectionNames.insert(theCollectionNames[i]);

         _hcids.push_back(-1);
     }
 

projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/SensitiveDetectorMessenger.cc	2014-08-05 23:40:31 UTC (rev 3233)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/SensitiveDetectorMessenger.cc	2014-08-05 23:55:57 UTC (rev 3234)
@@ -15,7 +15,6 @@

     if (_detectorsDir == 0) {
         makeDetectorsDir();
     }

-

     defineCommands(_detector);
 }
 

@@ -35,11 +34,10 @@

     } else if (cmd == _ecutCmd) {
         _detector->setEcut(_ecutCmd->GetNewDoubleValue(newVals));
     }

-

 }
 
 void SensitiveDetectorMessenger::makeDetectorsDir() {

-    _detectorsDir = new G4UIdirectory("/detectors/");

+    _detectorsDir = new G4UIdirectory("/lcdd/detectors/");

     _detectorsDir->SetGuidance("Commands for sensitive detectors. [LCDD]");
 }