Merge pull request #9307 from ianna/dd-expralgo-cleanup

Remove Obsolete Code
cms-sw · May 29, 2015 · 7082c5c · 7082c5c
2 parents 204a5d4 + 7b8cb39
commit 7082c5c
Show file tree

Hide file tree

Showing 23 changed files with 598 additions and 2,156 deletions.
diff --git a/DetectorDescription/Algorithm/src/DDAngular.cc b/DetectorDescription/Algorithm/src/DDAngular.cc
@@ -1,6 +1,7 @@
 #include "DetectorDescription/Algorithm/interface/DDAngular.h"
 #include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
 #include "DetectorDescription/Core/interface/DDSplit.h"
+#include "DetectorDescription/Base/interface/DDAlgoPar.h"
 #include "DetectorDescription/Base/interface/DDutils.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"

diff --git a/DetectorDescription/Core/interface/DDAlgo.h b/DetectorDescription/Core/interface/DDAlgo.h
diff --git a/DetectorDescription/Core/interface/DDCompactView.h b/DetectorDescription/Core/interface/DDCompactView.h
@@ -3,7 +3,6 @@
 
 #include <vector>
 
-#include "DetectorDescription/Core/interface/DDAlgo.h"
 #include "DetectorDescription/Core/interface/DDCompactViewImpl.h"
 #include "DetectorDescription/Core/interface/graphwalker.h"
 
@@ -118,12 +117,6 @@ class DDCompactView
   //! Prototype version of calculating the weight of a detector component
   double weight(const DDLogicalPart & p) const;
 
-  //! positioning...
-  void algoPosPart(const DDLogicalPart & self,
-		   const DDLogicalPart & parent,
-		   DDAlgo & algo
-		   );
-
   void position (const DDLogicalPart & self,
 		 const DDLogicalPart & parent,
 		 std::string copyno,

diff --git a/DetectorDescription/Core/src/DDAlgo.cc b/DetectorDescription/Core/src/DDAlgo.cc
diff --git a/DetectorDescription/Core/src/DDCompactView.cc b/DetectorDescription/Core/src/DDCompactView.cc
@@ -3,8 +3,6 @@
 #include "DetectorDescription/Core/interface/DDMaterial.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDName.h"
-#include "DetectorDescription/ExprAlgo/interface/AlgoPos.h"
-
 #include "DetectorDescription/Core/interface/DDSpecifics.h"
 #include "DetectorDescription/Base/interface/DDRotationMatrix.h"
 
@@ -103,34 +101,6 @@ double DDCompactView::weight(const DDLogicalPart & p) const
   return rep_->weight(p);
 }  
 
-void DDCompactView::algoPosPart(const DDLogicalPart & self,
-				const DDLogicalPart & parent,
-				DDAlgo & algo
-				) {
-  if (algo.rep().numRegistered() == 0) {
-    std::string e;
-    e = "DDalgoPosPart: algorithmic positioning\n";
-    e += "\t[" + algo.name().ns() 
-               + ":" 
-	       + algo.name().name() 
-	       + "] is not defined!\n";
-    throw cms::Exception("DDException") << e;
-  }
-
-  LogDebug ("AlgoPos")  << "DDCompactView, algo=" << std::endl << algo << std::endl;
-  int inner=0;
-  do { 
-    ++inner;
-    DDRotationMatrix * rmp = new DDRotationMatrix(algo.rotation());
-    DDRotation anonymRot = DDanonymousRot(rmp);
-    DDTranslation tr(algo.translation());
-    position(self, parent, algo.label(), tr, anonymRot); 
-    algo.next();
-  } 
-  while(algo.go());
-
-}
-
 void DDCompactView::position (const DDLogicalPart & self, 
 			      const DDLogicalPart & parent,
 			      std::string copyno,

diff --git a/DetectorDescription/Core/src/StoresInstantiation.cc b/DetectorDescription/Core/src/StoresInstantiation.cc
@@ -12,8 +12,7 @@
 #include <DetectorDescription/Core/src/Material.h>
 #include <DetectorDescription/Core/src/Solid.h>
 #include <DetectorDescription/Core/src/Specific.h>
-#include <DetectorDescription/ExprAlgo/interface/AlgoPos.h>
-#include <DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h>
+#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h"
 
 #include <string>
 #include <map>
@@ -28,7 +27,6 @@ template class DDI::Singleton<DDI::Store<DDName, std::string* > >;
 template class DDI::Singleton<DDI::Store<DDName, DDI::Material*> >;
 template class DDI::Singleton<DDI::Store<DDName, ReadMapType<double>* > >;
 template class DDI::Singleton<DDI::Store<DDName, std::vector<double>* > >;
-template class DDI::Singleton<DDI::Store<DDName, AlgoPos*> >;
 template class DDI::Singleton<DDI::Store<DDName, DDI::Specific*> >;
 template class DDI::Singleton<DDI::Store<DDName, DDI::LogicalPart*> >;
 template class DDI::Singleton<DDI::Store<DDName, DDI::Solid*> >;

diff --git a/DetectorDescription/ExprAlgo/BuildFile.xml b/DetectorDescription/ExprAlgo/BuildFile.xml
@@ -1,5 +1,4 @@
 <use   name="DetectorDescription/Base"/>
-<use   name="FWCore/MessageLogger"/>
 <use   name="clhep"/>
 <export>
   <lib   name="1"/>

diff --git a/DetectorDescription/ExprAlgo/interface/AlgoCheck.h b/DetectorDescription/ExprAlgo/interface/AlgoCheck.h