---

yaml --- r: 46430 b: "refs/heads/CMSSW_7_1_X" c: fd00240 h: "refs/heads/CMSSW_7_1_X" v: v3
cms-sw · Jun 24, 2008 · e11d725 · e11d725
1 parent 487131c
commit e11d725
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: ac155dadd83efa75cad55c0508a57a2b9dd3d66c
-"refs/heads/CMSSW_7_1_X": 0065172efa33a613fcaa4568ef5e4c0e469185f8
+"refs/heads/CMSSW_7_1_X": fd0024064e2b2fe3758461ee855cfb4cdbd67aaf
diff --git a/trunk/FastSimulation/CaloGeometryTools/BuildFile b/trunk/FastSimulation/CaloGeometryTools/BuildFile
@@ -8,9 +8,7 @@
 <use name=FastSimulation/Utilities>
 <use name=Geometry/CaloGeometry>
 <use name=Geometry/CaloTopology>
-<use name=Geometry/EcalBarrelAlgo>
-<use name=Geometry/EcalEndcapAlgo>
-<use name=Geometry/EcalPreshowerAlgo>
+<use name=Geometry/EcalAlgo>
 <use name=clhep>
 <use name=rootmath>
 <export>

diff --git a/trunk/FastSimulation/CaloGeometryTools/src/CaloGeometryHelper.cc b/trunk/FastSimulation/CaloGeometryTools/src/CaloGeometryHelper.cc
@@ -4,16 +4,16 @@
 
 // needed for the debugging
 #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
-#include "Geometry/EcalBarrelAlgo/interface/EcalBarrelGeometry.h"
-#include "Geometry/EcalEndcapAlgo/interface/EcalEndcapGeometry.h"
+#include "Geometry/EcalAlgo/interface/EcalBarrelGeometry.h"
+#include "Geometry/EcalAlgo/interface/EcalEndcapGeometry.h"
 #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
 
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
 #include "DataFormats/EcalDetId/interface/ESDetId.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
-#include "Geometry/EcalPreshowerAlgo/interface/EcalPreshowerGeometry.h"
+#include "Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h"
 
 #include "FastSimulation/CaloGeometryTools/interface/DistanceToCell.h"
 #include "FastSimulation/CaloGeometryTools/interface/Crystal.h"

diff --git a/trunk/FastSimulation/CaloGeometryTools/test/testCaloGeometryTools.cc b/trunk/FastSimulation/CaloGeometryTools/test/testCaloGeometryTools.cc
@@ -33,8 +33,8 @@
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
-#include "Geometry/EcalBarrelAlgo/interface/EcalBarrelGeometry.h"
-#include "Geometry/EcalEndcapAlgo/interface/EcalEndcapGeometry.h"
+#include "Geometry/EcalAlgo/interface/EcalBarrelGeometry.h"
+#include "Geometry/EcalAlgo/interface/EcalEndcapGeometry.h"
 
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDetId/interface/EEDetId.h"

diff --git a/trunk/FastSimulation/CaloHitMakers/BuildFile b/trunk/FastSimulation/CaloHitMakers/BuildFile
@@ -7,7 +7,7 @@
 <use name=FastSimulation/Event>
 <use name=FastSimulation/Utilities>
 <use name=Geometry/CaloTopology>
-<use name=Geometry/EcalPreshowerAlgo>
+<use name=Geometry/EcalAlgo>
 <use name=FWCore/MessageLogger>
 <use name=rootmath>
 <export>

diff --git a/trunk/FastSimulation/CaloHitMakers/src/EcalHitMaker.cc b/trunk/FastSimulation/CaloHitMakers/src/EcalHitMaker.cc
@@ -3,8 +3,8 @@
 //#include "DataFormats/EcalDetId/interface/EBDetId.h"
 //#include "DataFormats/EcalDetId/interface/EEDetId.h"
 
-//#include "Geometry/EcalBarrelAlgo/interface/EcalBarrelGeometry.h"
-//#include "Geometry/EcalEndcapAlgo/interface/EcalEndcapGeometry.h"
+//#include "Geometry/EcalAlgo/interface/EcalBarrelGeometry.h"
+//#include "Geometry/EcalAlgo/interface/EcalEndcapGeometry.h"
 //#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 
 #include "FastSimulation/CaloHitMakers/interface/EcalHitMaker.h"

diff --git a/trunk/FastSimulation/CaloHitMakers/src/PreshowerHitMaker.cc b/trunk/FastSimulation/CaloHitMakers/src/PreshowerHitMaker.cc
@@ -4,7 +4,7 @@
 #include "FastSimulation/Utilities/interface/LandauFluctuationGenerator.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
-#include "Geometry/EcalPreshowerAlgo/interface/EcalPreshowerGeometry.h"
+#include "Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h"
 
 #include "Math/GenVector/Plane3D.h"