Make sure DDConstants get filled

Once the expression pass has finished, we force the update of the DDConstants from the ClhepEvaluator being used.
cms-sw · Jun 15, 2018 · f94ca14 · f94ca14
1 parent f8dfba2
commit f94ca14
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/DetectorDescription/Parser/interface/DDLSAX2FileHandler.h b/DetectorDescription/Parser/interface/DDLSAX2FileHandler.h
@@ -52,15 +52,16 @@ class DDLSAX2FileHandler : public DDLSAX2Handler
   void characters( const XMLCh* chars, XMLSize_t length) override;
   void comment( const XMLCh* chars, XMLSize_t length ) override;
 
+  //! creates all DDConstant from the evaluator which has been already 'filled' in the first scan of the documents
+  void createDDConstants() const; 
+
  protected:
   DDLElementRegistry& registry() { return registry_; }
  private:
   virtual const std::string& parent() const;
   virtual const std::string& self() const;
 
  private:
-  //! creates all DDConstant from the evaluator which has been already 'filled' in the first scan of the documents
-  void createDDConstants() const; 
 
   std::vector< std::string > namesMap_;
   std::vector< size_t > names_;

diff --git a/DetectorDescription/Parser/src/DDLParser.cc b/DetectorDescription/Parser/src/DDLParser.cc
@@ -119,7 +119,7 @@ DDLParser::parseOneFile( const std::string& fullname )
 
     LogDebug ("DDLParser") << "ParseOneFile() Parsing: " << fileNames_[fIndex].second << std::endl;
     parseFile( fIndex );
-
+    expHandler_->createDDConstants();
     // PASS 2:
 
     SAX2Parser_->setContentHandler(fileHandler_);
@@ -141,6 +141,8 @@ DDLParser::parse( const std::vector<unsigned char>& ablob, unsigned int bsize )
   char* dummy(nullptr);
   MemBufInputSource  mbis( &*ablob.begin(), bsize, dummy );
   SAX2Parser_->parse(mbis);
+  expHandler_->createDDConstants();
+
 }
 
 int
@@ -202,6 +204,7 @@ DDLParser::parse( const DDLDocumentProvider& dp )
       parseFile(i);
     }
   }
+  expHandler_->createDDConstants();
 
   // PASS 2:
 

diff --git a/DetectorDescription/Parser/src/DDLSAX2FileHandler.cc b/DetectorDescription/Parser/src/DDLSAX2FileHandler.cc
@@ -19,7 +19,6 @@ DDLSAX2FileHandler::DDLSAX2FileHandler( DDCompactView & cpv, DDLElementRegistry&
 void
 DDLSAX2FileHandler::init()
 {
-  createDDConstants();
   namesMap_.emplace_back("*** root ***");
   names_.emplace_back(namesMap_.size() - 1);
 }