Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Run2-TB35 Update the packages for code format an correct TB geometry for scenario 1 of Oct 18 HGCal TB #26442

Merged
merged 6 commits into from Apr 18, 2019
Merged

Run2-TB35 Update the packages for code format an correct TB geometry for scenario 1 of Oct 18 HGCal TB #26442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
468cac2
Update the packages for code format an correct TB geometry for scenar…
Apr 11, 2019
2ca0670
Avoid remaining overlap
Apr 12, 2019
dd3172f
Switvh off the debig
Apr 12, 2019
0f55686
Take Kevin's comments
Apr 14, 2019
04678db
Correct one xml file
Apr 15, 2019
b144e20
Get rid of all cout in Geometry/HGCalCommonData src & plugin code
Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions Geometry/HGCalCommonData/data/TB181/Oct181/hgcal.xml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@

<ConstantsSection label="hgcal.xml" eval="true">
<Constant name="rmin" value="0.0*fm"/>
<Constant name="rmax" value="50.0*cm"/>
<Constant name="rmax" value="52.0*cm"/>
<Constant name="zCaloFront" value="2500*cm"/>
<Constant name="rminEE" value="0.0*fm"/>
<Constant name="rmaxEE" value="8.0*cm"/>
Expand All @@ -16,7 +16,7 @@
<Constant name="zminHE" value="0.0*fm"/>
<Constant name="zmaxHE" value="94.5*cm"/>
<Constant name="rminAH" value="0.0*fm"/>
<Constant name="rmaxAH" value="30.0*cm"/>
<Constant name="rmaxAH" value="[rmax]"/>
<Constant name="zminAH" value="0.0*fm"/>
<Constant name="zmaxAH" value="114*cm"/>
<Constant name="zgapEEFH" value="3.5*cm"/>
Expand Down Expand Up @@ -94,7 +94,6 @@
<ZSection z="-[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
<ZSection z= "[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
</Polyhedra>

<Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
<ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
<ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
Expand Down Expand Up @@ -226,6 +225,10 @@
<rSolid name="HGCalHEPCBAbs"/>
<rMaterial name="materials:G10"/>
</LogicalPart>
<LogicalPart name="HGCalHEAirAbsorber" category="unspecified">
<rSolid name="HGCalHEPCBAbs"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
</LogicalPartSection>

<PosPartSection label="hgcal.xml">
Expand Down
55 changes: 28 additions & 27 deletions Geometry/HGCalCommonData/data/TB181/Oct181/hgcalHE.xml
View file
Open in desktop
Expand Up @@ -19,11 +19,12 @@
<String name="GeneralMaterial" value="materials:Air"/>
<Vector name="WaferName" type="string" nEntries="2">
hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse</Vector>
<Vector name="CoverName" type="string" nEntries="8">
<Vector name="CoverName" type="string" nEntries="9">
hgcal:HGCalHESiliconSensitive, hgcal:HGCalHEPCB,
hgcal:HGCalHEKapton, hgcal:HGCalHEAbsorber,
hgcal:HGCalHECuAbsorber, hgcal:HGCalHEPCBAbsorber,
hgcal:HGCalHECuKapton, hgcal:HGCalHECuPCB</Vector>
hgcal:HGCalHECuKapton, hgcal:HGCalHECuPCB,
hgcal:HGCalHEAirAbsorber</Vector>
<Vector name="MaterialNames" type="string" nEntries="64">
materials:Air, materials:Air, materials:Air,
materials:Air, materials:Air, materials:Iron,
Expand Down Expand Up @@ -121,18 +122,18 @@
23, 5, 15, 0, 28, 7, 7, 7, 27, 1, 2, 6,
21, 5, 14, 0, 28, 7, 7, 7, 27, 1, 3, 6,
20, 5, 14, 0, 28, 7, 7, 7, 27, 1, 3, 6, 26, 8,
40, 61, 63, 32, 60, 39, 39, 39, 59, 33, 35, 38,
53, 37, 61, 63, 32, 60, 39, 39, 39, 59, 33, 35, 38,
48, 37, 43, 63, 32, 60, 39, 39, 39, 59, 33, 35, 38,
50, 37, 42, 63, 32, 60, 39, 39, 39, 59, 33, 35, 38,
52, 37, 62, 63, 32, 60, 39, 39, 39, 36, 38,
51, 37, 41, 63, 32, 60, 39, 39, 39, 59, 33, 59, 33, 35, 38,
49, 40, 56, 37, 57, 40, 61, 63, 32, 60, 39, 39, 39, 59, 33, 35, 38,
52, 37, 45, 63, 32, 60, 39, 39, 39, 59, 33, 35, 38,
54, 37, 44, 63, 32, 60, 39, 39, 39, 59, 33, 34, 38,
55, 37, 47, 63, 32, 60, 39, 39, 39, 59, 33, 38,
53, 37, 46, 63, 32, 60, 39, 39, 39, 59, 33, 38,
52, 37, 46, 63, 32, 60, 39, 39, 39, 59, 33, 38, 58, 40
40, 61, 32, 60, 39, 39, 39, 59, 33, 35, 63, 38,
53, 37, 61, 32, 60, 39, 39, 39, 59, 33, 35, 63, 38,
48, 37, 43, 32, 60, 39, 39, 39, 59, 33, 35, 63, 38,
50, 37, 42, 32, 60, 39, 39, 39, 59, 33, 35, 63, 38,
52, 37, 62, 32, 60, 39, 39, 39, 36, 63, 38,
51, 37, 41, 32, 60, 39, 39, 39, 59, 33, 59, 33, 35, 63, 38,
49, 40, 56, 37, 57, 40, 61, 32, 60, 39, 39, 39, 59, 33, 35, 63, 38,
52, 37, 45, 32, 60, 39, 39, 39, 59, 33, 35, 63, 38,
54, 37, 44, 32, 60, 39, 39, 39, 59, 33, 34, 63, 38,
55, 37, 47, 32, 60, 39, 39, 39, 59, 33, 34, 38,
53, 37, 46, 32, 60, 39, 39, 39, 59, 33, 35, 38,
52, 37, 46, 32, 60, 39, 39, 39, 59, 33, 35, 38, 58, 40
</Vector>
<Vector name="LayerSense" type="numeric" nEntries="316">
0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
Expand All @@ -147,18 +148,18 @@
0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 0,
0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0,
0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0, 0, 0,
0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
0, 0, 0, 2, 8, 1, 1, 1, 6, 9, 0,
0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 3, 5, 9, 0,
0, 0, 0, 0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 9, 0,
0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 0,
0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0,
0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0,
0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0,
0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0,
0, 0, 0, 0, 2, 8, 1, 1, 1, 6, 0,
0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 3, 5, 0,
0, 0, 0, 0, 0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0,
0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0,
0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 0,
0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 0,
0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 0,
0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 0, 0, 0
0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0, 0, 0
</Vector>
<Vector name="MaxModule" nEntries="316">
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
Expand All @@ -169,7 +170,7 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
Expand All @@ -178,7 +179,7 @@
0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0,
0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0,
0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 0,
0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 0,
0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0,
0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0,
0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0,
Expand Down
50 changes: 23 additions & 27 deletions Geometry/HGCalCommonData/interface/FastTimeDDDConstants.h
View file
Open in desktop
Expand Up @@ -5,47 +5,43 @@
*
* this class reads the constant section of
* the numbering xml-file for fast timer device
*
*
* \author Sunanda Banerjee, SINP <sunanda.banerjee@cern.ch>
*
*/

#include<string>
#include<vector>
#include<iostream>
#include <string>
#include <vector>

#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
#include "Geometry/HGCalCommonData/interface/FastTimeParameters.h"

class FastTimeDDDConstants {

public:

public:
FastTimeDDDConstants(const FastTimeParameters* ftp);
~FastTimeDDDConstants();

std::pair<int,int> getZPhi(double z, double phi) const;
std::pair<int,int> getEtaPhi(double r, double phi) const;
GlobalPoint getPosition(int type, int izeta, int iphi,
int zside) const;
std::vector<GlobalPoint> getCorners(int type, int izeta,int iphi,
int zside) const;
int getCells(int type) const;
double getRin(int type) const;
double getRout(int type) const;
double getZHalf(int type) const;
double getZPos(int type) const;
bool isValidXY(int type, int izeta, int iphi) const;
int numberEtaZ(int type) const;
int numberPhi(int type) const;

private:
void initialize();
std::pair<int, int> getZPhi(double z, double phi) const;
std::pair<int, int> getEtaPhi(double r, double phi) const;
GlobalPoint getPosition(int type, int izeta, int iphi, int zside) const;
std::vector<GlobalPoint> getCorners(int type, int izeta, int iphi,
int zside) const;
int getCells(int type) const;
double getRin(int type) const;
double getRout(int type) const;
double getZHalf(int type) const;
double getZPos(int type) const;
bool isValidXY(int type, int izeta, int iphi) const;
int numberEtaZ(int type) const;
int numberPhi(int type) const;

private:
void initialize();

const FastTimeParameters* ftpar_;
double etaMin_, etaMax_, dEta_;
double dZBarrel_, dPhiBarrel_, dPhiEndcap_;
std::vector<double> rLimits_;
double etaMin_, etaMax_, dEta_;
double dZBarrel_, dPhiBarrel_, dPhiEndcap_;
std::vector<double> rLimits_;
};

#endif
21 changes: 9 additions & 12 deletions Geometry/HGCalCommonData/interface/FastTimeParameters.h
View file
Open in desktop
@@ -1,25 +1,22 @@
#ifndef Geometry_HGCalCommonData_FastTimeParameters_h
#define Geometry_HGCalCommonData_FastTimeParameters_h

#include "CondFormats/Serialization/interface/Serializable.h"
#include <cstdint>
#include <string>
#include <vector>
#include <iostream>
#include <cstdint>
#include "CondFormats/Serialization/interface/Serializable.h"

class FastTimeParameters {

public:

public:
FastTimeParameters();
~FastTimeParameters();

int nZBarrel_;
int nPhiBarrel_;
int nEtaEndcap_;
int nPhiEndcap_;
std::vector<double> geomParBarrel_;
std::vector<double> geomParEndcap_;
int nZBarrel_;
int nPhiBarrel_;
int nEtaEndcap_;
int nPhiEndcap_;
std::vector<double> geomParBarrel_;
std::vector<double> geomParEndcap_;

COND_SERIALIZABLE;
};
Expand Down
9 changes: 5 additions & 4 deletions Geometry/HGCalCommonData/interface/FastTimeParametersFromDD.h
View file
Open in desktop
Expand Up @@ -8,13 +8,14 @@ class DDCompactView;
class FastTimeParameters;

class FastTimeParametersFromDD {
public:
public:
FastTimeParametersFromDD() {}
virtual ~FastTimeParametersFromDD() {}

bool build(const DDCompactView*, FastTimeParameters&, const std::string&,
const int);
private:
bool build(const DDCompactView *, FastTimeParameters &, const std::string &,
const int);

private:
std::vector<double> getDDDArray(const std::string &, const DDsvalues_type &);
};

Expand Down