* Move HGCalParameters class to common HGCal directory

* Add a schema for HGCalParameters as PHGCalParameters * Add serialization test for a new schema PHGCalParameters * Fix conflicts
cms-sw · Jan 4, 2016 · 95fcf83 · 95fcf83
1 parent 9933046
commit 95fcf83
Show file tree

Hide file tree

Showing 15 changed files with 130 additions and 54 deletions.
diff --git a/CondFormats/GeometryObjects/BuildFile.xml b/CondFormats/GeometryObjects/BuildFile.xml
@@ -5,7 +5,6 @@
 <use   name="DataFormats/DetId"/>
 <use   name="CondFormats/Serialization"/>
 <use   name="boost_serialization"/>
-<use   name="clhep"/>
 
 <export>
   <lib   name="1"/>

diff --git a/CondFormats/GeometryObjects/interface/PHGCalParameters.h b/CondFormats/GeometryObjects/interface/PHGCalParameters.h
@@ -0,0 +1,74 @@
+#ifndef CondFormats_GeometryObjects_PHGCalParameters_h
+#define CondFormats_GeometryObjects_PHGCalParameters_h
+
+#include "CondFormats/Serialization/interface/Serializable.h"
+#include <string>
+#include <vector>
+
+class PHGCalParameters {
+
+public:
+
+  PHGCalParameters( void ) {}
+  ~PHGCalParameters( void ) {}
+
+  std::string              name_;
+  std::vector<double>      cellSize_;
+  std::vector<double>      moduleBlS_;
+  std::vector<double>      moduleTlS_;
+  std::vector<double>      moduleHS_;
+  std::vector<double>      moduleDzS_;
+  std::vector<double>      moduleAlphaS_;
+  std::vector<double>      moduleCellS_;
+  std::vector<double>      moduleBlR_;
+  std::vector<double>      moduleTlR_;
+  std::vector<double>      moduleHR_;
+  std::vector<double>      moduleDzR_;
+  std::vector<double>      moduleAlphaR_;
+  std::vector<double>      moduleCellR_;
+  std::vector<double>      trformTranX_;
+  std::vector<double>      trformTranY_;
+  std::vector<double>      trformTranZ_;
+  std::vector<double>      trformRotXX_;
+  std::vector<double>      trformRotYX_;
+  std::vector<double>      trformRotZX_;
+  std::vector<double>      trformRotXY_;
+  std::vector<double>      trformRotYY_;
+  std::vector<double>      trformRotZY_;
+  std::vector<double>      trformRotXZ_;
+  std::vector<double>      trformRotYZ_;
+  std::vector<double>      trformRotZZ_;
+  std::vector<double>      zLayerHex_;
+  std::vector<double>      rMinLayHex_;
+  std::vector<double>      rMaxLayHex_;
+  std::vector<double>      waferPosX_;
+  std::vector<double>      waferPosY_;
+  std::vector<double>      cellFineX_;
+  std::vector<double>      cellFineY_;
+  std::vector<double>      cellCoarseX_;
+  std::vector<double>      cellCoarseY_;
+  std::vector<double>      boundR_;
+  std::vector<int>         moduleLayS_;
+  std::vector<int>         moduleLayR_;
+  std::vector<int>         layer_;
+  std::vector<int>         layerIndex_;
+  std::vector<int>         layerGroup_;
+  std::vector<int>         cellFactor_; 
+  std::vector<int>         depth_;
+  std::vector<int>         depthIndex_;
+  std::vector<int>         depthLayerF_;
+  std::vector<int>         waferCopy_;
+  std::vector<int>         waferTypeL_;
+  std::vector<int>         waferTypeT_;
+  std::vector<int>         layerGroupM_;
+  std::vector<int>         layerGroupO_;
+  std::vector<uint32_t>    trformIndex_;
+  double                   waferR_;
+  int                      nCells_;
+  int                      nSectors_;
+  int                      mode_;
+
+  COND_SERIALIZABLE;
+};
+
+#endif
diff --git a/CondFormats/GeometryObjects/src/T_EventSetup_HGCalParameters.cc b/CondFormats/GeometryObjects/src/T_EventSetup_HGCalParameters.cc
@@ -1,4 +1,4 @@
-#include "CondFormats/GeometryObjects/interface/HGCalParameters.h"
+#include "CondFormats/GeometryObjects/interface/PHGCalParameters.h"
 #include "FWCore/Utilities/interface/typelookup.h"
 
-TYPELOOKUP_DATA_REG(HGCalParameters);
+TYPELOOKUP_DATA_REG(PHGCalParameters);
diff --git a/CondFormats/GeometryObjects/src/classes.h b/CondFormats/GeometryObjects/src/classes.h
@@ -5,5 +5,5 @@
 #include "CondFormats/GeometryObjects/interface/CSCRecoDigiParameters.h"
 #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
 #include "CondFormats/GeometryObjects/interface/HcalParameters.h"
-#include "CondFormats/GeometryObjects/interface/HGCalParameters.h"
+#include "CondFormats/GeometryObjects/interface/PHGCalParameters.h"
 
diff --git a/CondFormats/GeometryObjects/src/classes_def.xml b/CondFormats/GeometryObjects/src/classes_def.xml
@@ -88,41 +88,21 @@
  </class>
  <class name="HcalParameters::LayerItem"/>
  <class name="std::vector<HcalParameters::LayerItem>"/>
- <class name="HGCalParameters" class_version="0"> 
+ <class name="PHGCalParameters" class_version="0"> 
    <field name="name_"            mapping="blob"/>
-   <field name="nCells_"          mapping="blob"/>
-   <field name="nSectors_"        mapping="blob"/>
    <field name="cellSize_"        mapping="blob"/>
-   <field name="layer_"           mapping="blob"/>
-   <field name="layerIndex_"      mapping="blob"/> 
-   <field name="layerGroup_"      mapping="blob"/> 
-   <field name="cellFactor_"      mapping="blob"/>
-   <field name="depth_"           mapping="blob"/> 
-   <field name="depthIndex_"      mapping="blob"/> 
-   <field name="depthLayerF_"     mapping="blob"/> 
-   <field name="zLayerHex_"       mapping="blob"/> 
-   <field name="rMinLayHex_"      mapping="blob"/>
-   <field name="rMaxLayHex_"      mapping="blob"/> 
-   <field name="waferCopy_"       mapping="blob"/> 
-   <field name="waferTypeL_"      mapping="blob"/> 
-   <field name="waferTypeT_"      mapping="blob"/> 
-   <field name="moduleLayS_"      mapping="blob"/>
    <field name="moduleBlS_"       mapping="blob"/>
    <field name="moduleTlS_"       mapping="blob"/>
    <field name="moduleHS_"        mapping="blob"/>
    <field name="moduleDzS_"       mapping="blob"/>
    <field name="moduleAlphaS_"    mapping="blob"/>
    <field name="moduleCellS_"     mapping="blob"/>
-   <field name="moduleLayR_"      mapping="blob"/>
    <field name="moduleBlR_"       mapping="blob"/>
    <field name="moduleTlR_"       mapping="blob"/>
    <field name="moduleHR_"        mapping="blob"/> 
    <field name="moduleDzR_"       mapping="blob"/>
    <field name="moduleAlphaR_"    mapping="blob"/>
    <field name="moduleCellR_"     mapping="blob"/> 
-   <field name="modules_"         mapping="blob"/>
-   <field name="moduler_"         mapping="blob"/>
-   <field name="trformIndex_"     mapping="blob"/> 
    <field name="trformTranX_"     mapping="blob"/> 
    <field name="trformTranY_"     mapping="blob"/> 
    <field name="trformTranZ_"     mapping="blob"/> 
@@ -135,16 +115,34 @@
    <field name="trformRotXZ_"     mapping="blob"/> 
    <field name="trformRotYZ_"     mapping="blob"/> 
    <field name="trformRotZZ_"     mapping="blob"/> 
+   <field name="zLayerHex_"       mapping="blob"/> 
+   <field name="rMinLayHex_"      mapping="blob"/>
+   <field name="rMaxLayHex_"      mapping="blob"/> 
    <field name="waferPosX_"       mapping="blob"/> 
    <field name="waferPosY_"       mapping="blob"/> 
    <field name="cellFineX_"       mapping="blob"/> 
    <field name="cellFineY_"       mapping="blob"/> 
    <field name="cellCoarseX_"     mapping="blob"/>
    <field name="cellCoarseY_"     mapping="blob"/>
+   <field name="boundR_"          mapping="blob"/>  
+   <field name="moduleLayS_"      mapping="blob"/>
+   <field name="moduleLayR_"      mapping="blob"/>    
+   <field name="layer_"           mapping="blob"/>
+   <field name="layerIndex_"      mapping="blob"/> 
+   <field name="layerGroup_"      mapping="blob"/> 
+   <field name="cellFactor_"      mapping="blob"/>
+   <field name="depth_"           mapping="blob"/> 
+   <field name="depthIndex_"      mapping="blob"/> 
+   <field name="depthLayerF_"     mapping="blob"/> 
+   <field name="waferCopy_"       mapping="blob"/> 
+   <field name="waferTypeL_"      mapping="blob"/> 
+   <field name="waferTypeT_"      mapping="blob"/>
    <field name="layerGroupM_"     mapping="blob"/>  
    <field name="layerGroupO_"     mapping="blob"/>  
-   <field name="boundR_"          mapping="blob"/>  
+   <field name="trformIndex_"     mapping="blob"/> 
    <field name="waferR_"          mapping="blob"/>  
+   <field name="nCells_"          mapping="blob"/>
+   <field name="nSectors_"        mapping="blob"/>
    <field name="mode_"            mapping="blob"/>  
  </class>
 </lcgdict> 
diff --git a/CondFormats/GeometryObjects/test/testSerializationGeometryObjects.cpp b/CondFormats/GeometryObjects/test/testSerializationGeometryObjects.cpp
@@ -16,6 +16,7 @@ int main()
     testSerialization<PTrackerParameters>();
     testSerialization<PTrackerParameters::Item>();
     testSerialization<HcalParameters>();
+    testSerialization<PHGCalParameters>();
 
     return 0;
 }
diff --git a/Geometry/HGCalCommonData/BuildFile.xml b/Geometry/HGCalCommonData/BuildFile.xml
@@ -1,6 +1,5 @@
 <use   name="DetectorDescription/Base"/>
 <use   name="DetectorDescription/Core"/>
-<use   name="CondFormats/GeometryObjects"/>
 <export>
   <lib   name="1"/>
 </export>
diff --git a/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h b/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h
@@ -11,10 +11,10 @@
  *
  */
 
-#include<string>
-#include<vector>
-#include<iostream>
-#include "CondFormats/GeometryObjects/interface/HGCalParameters.h"
+#include <string>
+#include <vector>
+#include <iostream>
+#include "Geometry/HGCalCommonData/interface/HGCalParameters.h"
 #include "DetectorDescription/Core/interface/DDsvalues.h"
 
 class HGCalDDDConstants {

diff --git a/Geometry/HGCalCommonData/interface/HGCalGeomParameters.h b/Geometry/HGCalCommonData/interface/HGCalGeomParameters.h
@@ -11,12 +11,13 @@
  *
  */
 
-#include<string>
-#include<vector>
-#include<iostream>
+#include <string>
+#include <vector>
+#include <iostream>
 
 #include "DetectorDescription/Core/interface/DDsvalues.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
+
 class DDCompactView;    
 class DDFilteredView;
 class HGCalParameters;

diff --git a/...ometryObjects/interface/HGCalParameters.h → ...CalCommonData/interface/HGCalParameters.h b/...ometryObjects/interface/HGCalParameters.h → ...CalCommonData/interface/HGCalParameters.h
@@ -1,13 +1,13 @@
-#ifndef CondFormats_GeometryObjects_HGCalParameters_h
-#define CondFormats_GeometryObjects_HGCalParameters_h
+#ifndef Geometry_HGCalCommonData_HGCalParameters_h
+#define Geometry_HGCalCommonData_HGCalParameters_h
 
 #include "CondFormats/Serialization/interface/Serializable.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
-#include<string>
-#include<vector>
-#include<iostream>
-#include<stdint.h>
-#include<CLHEP/Geometry/Transform3D.h>
+#include <CLHEP/Geometry/Transform3D.h>
+#include <string>
+#include <vector>
+#include <iostream>
+#include <stdint.h>
 
 class HGCalParameters {
 

diff --git a/Geometry/HGCalCommonData/plugins/HGCalNumberingInitialization.cc b/Geometry/HGCalCommonData/plugins/HGCalNumberingInitialization.cc
@@ -21,15 +21,15 @@
 #include <boost/shared_ptr.hpp>
 
 // user include files
-#include <FWCore/Framework/interface/ModuleFactory.h>
-#include <FWCore/Framework/interface/ESProducer.h>
-#include <FWCore/Framework/interface/ESHandle.h>
-#include <FWCore/ParameterSet/interface/ParameterSet.h>
-#include <FWCore/MessageLogger/interface/MessageLogger.h>
-
-#include <CondFormats/GeometryObjects/interface/HGCalParameters.h>
-#include <Geometry/HGCalCommonData/interface/HGCalDDDConstants.h>
-#include <Geometry/Records/interface/IdealGeometryRecord.h>
+#include "FWCore/Framework/interface/ModuleFactory.h"
+#include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+
+#include "Geometry/HGCalCommonData/interface/HGCalParameters.h"
+#include "Geometry/HGCalCommonData/interface/HGCalDDDConstants.h"
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
 
 //#define DebugLog
 

diff --git a/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc b/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc
@@ -3,7 +3,7 @@
 #include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "CondFormats/GeometryObjects/interface/HGCalParameters.h"
+#include "Geometry/HGCalCommonData/interface/HGCalParameters.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/HGCalCommonData/interface/HGCalParametersFromDD.h"

diff --git a/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc b/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc
@@ -11,7 +11,7 @@
 #include "DetectorDescription/Core/interface/DDVectorGetter.h"
 #include "DetectorDescription/Core/interface/DDFilteredView.h"
 #include "DetectorDescription/RegressionTest/interface/DDErrorDetection.h"
-#include "CondFormats/GeometryObjects/interface/HGCalParameters.h"
+#include "Geometry/HGCalCommonData/interface/HGCalParameters.h"
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 

diff --git a/...ts/GeometryObjects/src/HGCalParameters.cc → ...ry/HGCalCommonData/src/HGCalParameters.cc b/...ts/GeometryObjects/src/HGCalParameters.cc → ...ry/HGCalCommonData/src/HGCalParameters.cc
@@ -1,4 +1,4 @@
-#include "CondFormats/GeometryObjects/interface/HGCalParameters.h"
+#include "Geometry/HGCalCommonData/interface/HGCalParameters.h"
 //#define DebugLog
 
 HGCalParameters::HGCalParameters(const std::string& nam): name_(nam) { }
@@ -144,3 +144,7 @@ void HGCalParameters::scaleTrForm(double scale) {
     trformTranZ_[k-1] *= scale;
   }
 }
+
+#include "FWCore/Utilities/interface/typelookup.h"
+
+TYPELOOKUP_DATA_REG(HGCalParameters);
diff --git a/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc b/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc
@@ -1,7 +1,7 @@
 #include "Geometry/HGCalCommonData/interface/HGCalParametersFromDD.h"
 #include "Geometry/HGCalCommonData/interface/HGCalGeomParameters.h"
 #include "Geometry/HGCalCommonData/interface/HGCalGeometryMode.h"
-#include "CondFormats/GeometryObjects/interface/HGCalParameters.h"
+#include "Geometry/HGCalCommonData/interface/HGCalParameters.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "DetectorDescription/Core/interface/DDFilteredView.h"
 #include "DetectorDescription/Core/interface/DDVectorGetter.h"