[go: nahoru, domu]
Skip to content

Commit

Permalink
Remove some names from cdc files
Browse files Browse the repository at this point in the history
  • Loading branch information
@GiacomoXT
GiacomoXT committed Jul 7, 2021
1 parent c908b03 commit db81947
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 47 deletions.
8 changes: 4 additions & 4 deletions cdc/data/CDC-Covers.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
<InnerR2 desc="Inner radius far from IP" unit="mm">160.0</InnerR2>
<OuterR1 desc="Outer radius near IP" unit="mm">165.5</OuterR1>
<OuterR2 desc="Outer radius far from IP" unit="mm">165.5</OuterR2>
<!--<Thickness desc="The thickness of the cover" unit="mm">62.0</Thickness> 2018.05.30 Nakano -->
<!--<Thickness desc="The thickness of the cover" unit="mm">62.0</Thickness> -->
<Thickness desc="The thickness of the cover" unit="mm">63.0</Thickness>
<Angle desc="The angle between the cover and z axis" unit="rad">0.0</Angle>
<!--<PosZ desc="Z position near IP" unit="mm">-323.1</PosZ> 2018.05.30 Nakano-->
<!--<PosZ desc="Z position near IP" unit="mm">-323.1</PosZ> -->
<PosZ desc="Z position near IP" unit="mm">-322.1</PosZ>
</Cover>
<Cover id="5" desc="Backward inner ring 2">
Expand Down Expand Up @@ -145,7 +145,7 @@
<InnerR2 desc="Inner radius far from IP" unit="mm">160.0</InnerR2>
<OuterR1 desc="Outer radius near IP" unit="mm">165.5</OuterR1>
<OuterR2 desc="Outer radius far from IP" unit="mm">165.5</OuterR2>
<!--<Thickness desc="The thickness of the cover" unit="mm">62.0</Thickness> 2018.05.30 Nakano -->
<!--<Thickness desc="The thickness of the cover" unit="mm">62.0</Thickness> -->
<Thickness desc="The thickness of the cover" unit="mm">63.0</Thickness>
<Angle desc="The angle between the cover and z axis" unit="rad">0.0</Angle>
<PosZ desc="Z position near IP" unit="mm">645.1</PosZ>
Expand Down Expand Up @@ -820,7 +820,7 @@ Rib6 (trapezoid-tube)
<PosZ desc="Z position near IP" unit="mm">1649.5</PosZ>
<Offset desc="Number of divisions">0</Offset>
<NDiv desc="Number of divisions">24</NDiv>
</Rib> 2018.05.18 Nakano -->
</Rib> -->
<Rib id="2" desc="L Angle 1-1">
<Name>LAngle1</Name>
<Length desc="LAngle1 length (X)" unit="mm">3.0</Length>
Expand Down
54 changes: 27 additions & 27 deletions cdc/data/CDC.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@
<InnerR desc="Inner radius" unit="mm">163</InnerR>
<OuterR desc="Outer radius" unit="mm">166</OuterR>
<!--<BackwardZ desc="Backward z position" unit="mm">-323.1</BackwardZ>
<ForwardZ desc="Forward z position" unit="mm">-312.0</ForwardZ> 2018.05.30 Nakano -->
<ForwardZ desc="Forward z position" unit="mm">-312.0</ForwardZ> -->
<ForwardZ desc="Forward z position" unit="mm">-312.0</ForwardZ>
<!--<ForwardZ desc="Forward z position" unit="mm">-313.1</ForwardZ> Temporary commented this line out. should be used -->
<BackwardZ desc="Backward z position" unit="mm">-322.1</BackwardZ>
Expand Down Expand Up @@ -1048,8 +1048,8 @@
<InnerR desc="Inner radius" unit="mm">163</InnerR>
<OuterR desc="Outer radius" unit="mm">166</OuterR>
<BackwardZ desc="Backward z position" unit="mm">572.0</BackwardZ>-->
<!--<ForwardZ desc="Forward z position" unit="mm">583.1</ForwardZ> 2018.05.30 Nakano-->
<!--<BackwardZ desc="Backward z position" unit="mm">573.1</BackwardZ>-->
<!--<ForwardZ desc="Forward z position" unit="mm">583.1</ForwardZ> -->
<!--<BackwardZ desc="Backward z position" unit="mm">573.1</BackwardZ> -->
<ForwardZ desc="Forward z position" unit="mm">582.1</ForwardZ>
</EndplateLayer>
<EndplateLayer id="5">
Expand Down Expand Up @@ -1542,7 +1542,7 @@
<OuterR desc="Outer radius" unit="mm">243</OuterR>
<BackwardZ desc="Backward z position" unit="mm">-452.0</BackwardZ>
<ForwardZ desc="Forward z position" unit="mm">-442.0</ForwardZ>
</EndplateLayer><!-- should be commented out 2018.05.30 Nakano -->
</EndplateLayer><!-- should be commented out -->
<!-- <EndplateLayer id="3">
<Name>BackwardEndplate</Name>
<InnerR desc="Inner radius" unit="mm">240</InnerR>
Expand All @@ -1556,7 +1556,7 @@
<OuterR desc="Outer radius" unit="mm">243</OuterR>
<BackwardZ desc="Backward z position" unit="mm">-443.34</BackwardZ>
<ForwardZ desc="Forward z position" unit="mm">-433.34</ForwardZ>
</EndplateLayer> 2018.06.07 Temporary comment out Nakano -->
</EndplateLayer> Temporary comment out -->
<EndplateLayer id="5">
<Name>ForwardEndplate</Name>
<InnerR desc="Inner radius" unit="mm">233</InnerR>
Expand Down Expand Up @@ -1622,7 +1622,7 @@
<OuterR desc="Outer radius" unit="mm">263.37</OuterR>
<BackwardZ desc="Backward z position" unit="mm">-489.91</BackwardZ>
<ForwardZ desc="Forward z position" unit="mm">-464.15</ForwardZ>
</EndplateLayer><!-- 2018.05.30 Nakano -->
</EndplateLayer>
<!--<EndplateLayer id="0">
<Name>BackwardEndplate</Name>
<InnerR desc="Inner radius" unit="mm">243</InnerR>
Expand Down Expand Up @@ -1650,7 +1650,7 @@
<OuterR desc="Outer radius" unit="mm">263.37</OuterR>
<BackwardZ desc="Backward z position" unit="mm">-489.91</BackwardZ>
<ForwardZ desc="Forward z position" unit="mm">-462.1</ForwardZ>
</EndplateLayer> 2018.06.07 Temporary comment out Nakano -->
</EndplateLayer> Temporary comment out -->
<EndplateLayer id="4">
<Name>BackwardEndplate</Name>
<InnerR desc="Inner radius" unit="mm">263.37</InnerR>
Expand Down Expand Up @@ -1679,7 +1679,7 @@
<OuterR desc="Outer radius" unit="mm">259.73</OuterR>
<BackwardZ desc="Backward z position" unit="mm">855.1</BackwardZ>
<ForwardZ desc="Forward z position" unit="mm">871.1</ForwardZ>
</EndplateLayer><!-- 2018.05.30 Nakano -->
</EndplateLayer>
<!--<EndplateLayer id="5">
<Name>ForwardEndplate</Name>
<InnerR desc="Inner radius" unit="mm">243</InnerR>
Expand All @@ -1700,7 +1700,7 @@
<OuterR desc="Outer radius" unit="mm">259.73</OuterR>
<BackwardZ desc="Backward z position" unit="mm">855.1</BackwardZ>
<ForwardZ desc="Forward z position" unit="mm">871.1</ForwardZ>
</EndplateLayer> 2018.06.07 Temporary comment out Nakano -->
</EndplateLayer> Temporary comment out -->
<EndplateLayer id="8">
<Name>ForwardEndplate</Name>
<InnerR desc="Inner radius" unit="mm">259.73</InnerR>
Expand Down Expand Up @@ -3961,7 +3961,7 @@
<BackwardZ desc="Backward z position" unit="mm">-734</BackwardZ>
<ForwardZ desc="Forward z position" unit="mm">-724</ForwardZ>
<!--<BackwardZ desc="Backward z position" unit="mm">-735</BackwardZ>
<ForwardZ desc="Forward z position" unit="mm">-725</ForwardZ> 2018.05.30 Nakano these values should be used. temporary comment out -->
<ForwardZ desc="Forward z position" unit="mm">-725</ForwardZ> these values should be used. temporary comment out -->
</EndplateLayer>
<EndplateLayer id="3">
<Name>ForwardEndplate</Name>
Expand All @@ -3984,11 +3984,11 @@
<BackwardZ desc="Backward z position" unit="mm">1579</BackwardZ>
<ForwardZ desc="Forward z position" unit="mm">1589</ForwardZ>
<!--<BackwardZ desc="Backward z position" unit="mm">1580</BackwardZ>
<ForwardZ desc="Forward z position" unit="mm">1590</ForwardZ> 2018.05.30 Nakano these values should be used. temporary comment out -->
<ForwardZ desc="Forward z position" unit="mm">1590</ForwardZ> these values should be used. temporary comment out -->
</EndplateLayer>
</Endplate>
</Endplates>
<!-- removed by Nakano Apr.19, 2018
<!-- removed by
<ElectronicsBoards>
<ElectronicsBoard id="0">
<EBInnerR desc="Inner radius of electronics board" unit="mm">326.0</EBInnerR>
Expand Down Expand Up @@ -4112,7 +4112,7 @@
<!--<InnerR desc="Inner radius" unit="mm">163.01</InnerR>
<OuterR desc="Outer radius" unit="mm">163.11</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">-292.1</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">552.1</ForwardZ> 2018.05.30 Nakano-->
<ForwardZ desc="z position at forward endplate" unit="mm">552.1</ForwardZ> -->
<InnerR desc="Inner radius" unit="mm">162.9</InnerR>
<OuterR desc="Outer radius" unit="mm">163.0</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">-313.1</BackwardZ>
Expand All @@ -4123,7 +4123,7 @@
<!--<InnerR desc="Inner radius" unit="mm">162.5</InnerR>
<OuterR desc="Outer radius" unit="mm">162.96</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">-292.1</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">552.1</ForwardZ> 2018.05.30 Nakano -->
<ForwardZ desc="z position at forward endplate" unit="mm">552.1</ForwardZ> -->
<InnerR desc="Inner radius" unit="mm">162.39</InnerR>
<OuterR desc="Outer radius" unit="mm">162.85</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">-313.1</BackwardZ>
Expand All @@ -4134,7 +4134,7 @@
<!--<InnerR desc="Inner radius" unit="mm">160.0</InnerR>
<OuterR desc="Outer radius" unit="mm">162.35</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">-307.1</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">-292.1</ForwardZ> 2018.05.30 Nakano-->
<ForwardZ desc="z position at forward endplate" unit="mm">-292.1</ForwardZ> -->
<InnerR desc="Inner radius" unit="mm">160.0</InnerR>
<OuterR desc="Outer radius" unit="mm">162.24</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">-313.1</BackwardZ>
Expand All @@ -4145,7 +4145,7 @@
<InnerR desc="Inner radius" unit="mm">160.0</InnerR>
<OuterR desc="Outer radius" unit="mm">163.0</OuterR>
<!--<BackwardZ desc="z position at backward endplate" unit="mm">-312.1</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">-307.1</ForwardZ> 2018.05.30 Nakano-->
<ForwardZ desc="z position at forward endplate" unit="mm">-307.1</ForwardZ> -->
<BackwardZ desc="z position at backward endplate" unit="mm">-322.1</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">-313.1</ForwardZ>
</InnerWall>
Expand All @@ -4154,7 +4154,7 @@
<!--<InnerR desc="Inner radius" unit="mm">160</InnerR>
<OuterR desc="Outer radius" unit="mm">162.35</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">552.1</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">567.1</ForwardZ> 2018.05.30 Nakano -->
<ForwardZ desc="z position at forward endplate" unit="mm">567.1</ForwardZ> -->
<InnerR desc="Inner radius" unit="mm">160</InnerR>
<OuterR desc="Outer radius" unit="mm">162.24</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">558.1</BackwardZ>
Expand All @@ -4165,7 +4165,7 @@
<InnerR desc="Inner radius" unit="mm">160</InnerR>
<OuterR desc="Outer radius" unit="mm">163.0</OuterR>
<!--<BackwardZ desc="z position at backward endplate" unit="mm">567.1</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">572.1</ForwardZ> 2018.05.30 Nakano-->
<ForwardZ desc="z position at forward endplate" unit="mm">572.1</ForwardZ> -->
<BackwardZ desc="z position at backward endplate" unit="mm">573.1</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">582.1</ForwardZ>
</InnerWall>
Expand All @@ -4187,8 +4187,8 @@
<InnerR desc="Inner radius" unit="mm">1120.5</InnerR>
<OuterR desc="Outer radius" unit="mm">1120.6</OuterR>
<!--<BackwardZ desc="z position at backward endplate" unit="mm">-683</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">1533</ForwardZ> 2018.05.30 Nakano-->
<!--<BackwardZ desc="z position at backward endplate" unit="mm">-714.415</BackwardZ> -714.415 may not be correct 2018.06.07 Nakano-->
<ForwardZ desc="z position at forward endplate" unit="mm">1533</ForwardZ> -->
<!--<BackwardZ desc="z position at backward endplate" unit="mm">-714.415</BackwardZ> -714.415 may not be correct -->
<BackwardZ desc="z position at backward endplate" unit="mm">-703</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">1569.41</ForwardZ>
</OuterWall>
Expand All @@ -4197,26 +4197,26 @@
<InnerR desc="Inner radius" unit="mm">1120.6</InnerR>
<OuterR desc="Outer radius" unit="mm">1126.065</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">-703</BackwardZ>
<!--<ForwardZ desc="z position at forward endplate" unit="mm">1553</ForwardZ> 2018.05.30 Nakano-->
<!--<BackwardZ desc="z position at backward endplate" unit="mm">-714.415</BackwardZ> -703 mm may be correct 2018.06.07 Nakano-->
<!--<ForwardZ desc="z position at forward endplate" unit="mm">1553</ForwardZ> -->
<!--<BackwardZ desc="z position at backward endplate" unit="mm">-714.415</BackwardZ> -703 mm may be correct -->
<ForwardZ desc="z position at forward endplate" unit="mm">1569.41</ForwardZ>-->
</OuterWall>
<OuterWall id="2">
<Name>InnerBackwardWall</Name>
<InnerR desc="Inner radius" unit="mm">1120.5</InnerR>
<OuterR desc="Outer radius" unit="mm">1126.065</OuterR>
<!--<BackwardZ desc="z position at backward endplate" unit="mm">-713.585</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">-703</ForwardZ> 2018.05.30 Nakano -->
<ForwardZ desc="z position at forward endplate" unit="mm">-703</ForwardZ> -->
<BackwardZ desc="z position at backward endplate" unit="mm">-725.0</BackwardZ>
<!--<ForwardZ desc="z position at forward endplate" unit="mm">-714.415</ForwardZ> -703 mm may be correct 2018.06.07 Nakano-->
<!--<ForwardZ desc="z position at forward endplate" unit="mm">-714.415</ForwardZ> -703 mm may be correct -->
<ForwardZ desc="z position at forward endplate" unit="mm">-703</ForwardZ>
</OuterWall>
<OuterWall id="3">
<Name>OuterBackwardWall</Name>
<InnerR desc="Inner radius" unit="mm">1120.5</InnerR>
<!--<OuterR desc="Outer radius" unit="mm">1127.6</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">-723.585</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">-713.585</ForwardZ> 2018.05.30 Nakano -->
<ForwardZ desc="z position at forward endplate" unit="mm">-713.585</ForwardZ> -->
<OuterR desc="Outer radius" unit="mm">1130.0</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">-735.0</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">-725.0</ForwardZ>
Expand All @@ -4226,7 +4226,7 @@
<InnerR desc="Inner radius" unit="mm">1120.5</InnerR>
<OuterR desc="Outer radius" unit="mm">1126.065</OuterR>
<!--<BackwardZ desc="z position at backward endplate" unit="mm">1553</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">1563.59</ForwardZ> 2018.05.30 Nakano -->
<ForwardZ desc="z position at forward endplate" unit="mm">1563.59</ForwardZ> -->
<BackwardZ desc="z position at backward endplate" unit="mm">1569.41</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">1580.0</ForwardZ>
</OuterWall>
Expand All @@ -4235,7 +4235,7 @@
<InnerR desc="Inner radius" unit="mm">1120.5</InnerR>
<!--<OuterR desc="Outer radius" unit="mm">1127.6</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">1563.59</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">1573.59</ForwardZ> 2018.05.30 Nakano -->
<ForwardZ desc="z position at forward endplate" unit="mm">1573.59</ForwardZ> -->
<OuterR desc="Outer radius" unit="mm">1130.0</OuterR>
<BackwardZ desc="z position at backward endplate" unit="mm">1580.0</BackwardZ>
<ForwardZ desc="z position at forward endplate" unit="mm">1590.0</ForwardZ>
Expand Down
4 changes: 2 additions & 2 deletions cdc/dataobjects/src/CDCRecoHit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ std::vector<genfit::MeasurementOnPlane*> CDCRecoHit::constructMeasurementsOnPlan
{
double z = state.getPos().Z();
const TVector3& p = state.getMom();
// Calculate alpha and theta. A description was given by H. Ozaki in
// Calculate alpha and theta. A description was given in
// https://indico.mpp.mpg.de/getFile.py/access?contribId=5&sessionId=3&resId=0&materialId=slides&confId=3195

//Comment out the following 2 lines since they introduce dependence on cdclib (or circular dependence betw. cdc_objects and cdclib).
Expand Down Expand Up @@ -262,7 +262,7 @@ std::vector<double> CDCRecoHit::timeDerivativesMeasurementsOnPlane(const genfit:
{
double z = state.getPos().Z();
const TVector3& p = state.getMom();
// Calculate alpha and theta. A description was given by H. Ozaki in
// Calculate alpha and theta. A description was given by in
// https://indico.mpp.mpg.de/getFile.py/access?contribId=5&sessionId=3&resId=0&materialId=slides&confId=3195

//Comment out the following 2 lines since they introduce dependence on cdclib (or circular dependence betw. cdc_objects and cdclib).
Expand Down
7 changes: 2 additions & 5 deletions cdc/geometry/src/GeoCDCCreator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ namespace Belle2 {
G4Material* medGlue = geometry::Materials::get("CDCGlue");
G4Material* medAir = geometry::Materials::get("Air");

// Nakano
G4double h2odensity = 1.000 * CLHEP::g / CLHEP::cm3;
G4double a = 1.01 * CLHEP::g / CLHEP::mole;
G4Element* elH = new G4Element("Hydrogen", "H", 1., a);
Expand Down Expand Up @@ -794,7 +793,7 @@ namespace Belle2 {

//G4LogicalVolume* logicalV = new G4LogicalVolume(boxShape, medAluminum,
// logicalName, 0, 0, 0);
// ID depndent material definition, Aluminum is default : Nakano
// ID depndent material definition, Aluminum is default
G4LogicalVolume* logicalV = new G4LogicalVolume(boxShape, medAluminum, logicalName, 0, 0, 0);
if (id > 39 && id < 78) // Cu
logicalV = new G4LogicalVolume(boxShape, medCopper, logicalName, 0, 0, 0);
Expand Down Expand Up @@ -1179,7 +1178,6 @@ namespace Belle2 {
string Aluminum = content.getString("Aluminum");
G4Material* medAluminum = geometry::Materials::get(Aluminum);
G4Material* medNEMA_G10_Plate = geometry::Materials::get("NEMA_G10_Plate");
// Nakano
G4double density = 1.000 * CLHEP::g / CLHEP::cm3;
G4double a = 1.01 * CLHEP::g / CLHEP::mole;
G4Element* elH = new G4Element("Hydrogen", "H", 1., a);
Expand Down Expand Up @@ -1307,7 +1305,7 @@ namespace Belle2 {

//G4LogicalVolume* logicalV = new G4LogicalVolume(boxShape, medAluminum,
// logicalName, 0, 0, 0);
// ID dependent material definition Aluminum is default: Nakano
// ID dependent material definition Aluminum is default
G4LogicalVolume* logicalV = new G4LogicalVolume(boxShape, medAluminum, logicalName, 0, 0, 0);
if (ribID > 39 && ribID < 78) // Cu box
logicalV = new G4LogicalVolume(boxShape, medCopper, logicalName, 0, 0, 0);
Expand Down Expand Up @@ -1606,7 +1604,6 @@ namespace Belle2 {
void GeoCDCCreator::createCovers(const CDCGeometry& geom)
{
G4Material* medAl = geometry::Materials::get("Al");
// Nakano
G4double density = 1.000 * CLHEP::g / CLHEP::cm3;
G4double a = 1.01 * CLHEP::g / CLHEP::mole;
G4Element* elH = new G4Element("Hydrogen", "H", 1., a);
Expand Down
2 changes: 1 addition & 1 deletion cdc/modules/cdcDigitizer/src/CDCDigitizerModule.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ double CDCDigitizerModule::getDriftTime(const double driftLength, const bool add
void CDCDigitizerModule::makeSignalsAfterShapers(const WireID& wid, double dEinGeV, double dx, double costh,
unsigned short& adcCount, double& convFactorForThreshold)
{
static double conv00 = (100.0 / 3.2); //keV -> coun (original from E. Nakano from some test beam results)
static double conv00 = (100.0 / 3.2); //keV -> coun (original from some test beam results)
convFactorForThreshold = conv00;
adcCount = 0;
if (dEinGeV <= 0. || dx <= 0.) return;
Expand Down
Loading

0 comments on commit db81947

Please sign in to comment.