Skip to content

Commit

Permalink
[DriftChamber] Revert spurious renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
@BrieucF
BrieucF committed Dec 6, 2023
1 parent b10e536 commit 6faa225
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions detector/tracker/DriftChamber_o1_v01.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,9 @@ void CDCHBuild::build_layer(DetElement parent, Volume parentVol, dd4hep::Sensiti
double fakeLayerInIWthick = -0.0001 + GasInnerWallThick;
double guard_layer_inner_radius_at_z_0 = inner_radius + envelop_Inner_thickness - fakeLayerInIWthick;

double layer_inner_radius_at_z_0 = inner_radius + envelop_Inner_thickness + FWradii + secure + capGasLayer;
double layer_outer_radius_at_z_0 = layer_inner_radius_at_z_0 - FWradii - secure;
double radius_layer_0 = inner_radius + envelop_Inner_thickness + FWradii + secure + capGasLayer;
double layer_outer_radius_at_z_0 = radius_layer_0 - FWradii - secure;
double layer_inner_radius_at_z_0 = 0.0;
double layer_inner_radius_at_z_end = 0.0;
double layer_outer_radius_at_z_end = 0.0;

Expand Down Expand Up @@ -324,12 +325,12 @@ void CDCHBuild::build_layer(DetElement parent, Volume parentVol, dd4hep::Sensiti
guard_wires.name = string("Gwire_inner_stereominus");
CDCHBuild::PlaceGuardWires(guard_wires, FWireShellThickOut, halflength, SL, -1);

drop = layer_inner_radius_at_z_0 * dropFactor;
radius_layer = layer_inner_radius_at_z_0 + drop;
drop = radius_layer_0 * dropFactor;
radius_layer = radius_layer_0 + drop;
epsilon = atan(radius_layer * epsilonFactor);
layer_inner_radius_at_z_0 = layer_inner_radius_at_z_0 - FWradii - 2.0 * secure;
layer_inner_radius_at_z_0 = radius_layer_0 - FWradii - 2.0 * secure;
layer_inner_radius_at_z_end = layer_inner_radius_at_z_0 + drop;
layer_outer_radius_at_z_0 = layer_inner_radius_at_z_0 + FWradii;
layer_outer_radius_at_z_0 = radius_layer_0 + FWradii;
layer_outer_radius_at_z_end = layer_outer_radius_at_z_0 + drop;
epsilonIn = atan(sqrt(pow(layer_inner_radius_at_z_end, 2) - pow(layer_inner_radius_at_z_0, 2)) / halflength);
epsilonOut = atan(sqrt(pow(layer_outer_radius_at_z_end, 2) - pow(layer_outer_radius_at_z_0, 2)) / halflength);
Expand Down Expand Up @@ -363,7 +364,7 @@ void CDCHBuild::build_layer(DetElement parent, Volume parentVol, dd4hep::Sensiti
field_wires_top.volume = lvFwireVol.back();
CDCHBuild::PlaceGuardWires(field_wires_top, FWireShellThickOut, halflength, SL, -1);

layer_inner_radius_at_z_0 += FWradii;
radius_layer_0 += FWradii;

} else {
delta_radius_layer = 2. * TMath::Pi() * layer_outer_radius_at_z_0 / (nSWire - TMath::Pi());
Expand All @@ -379,7 +380,7 @@ void CDCHBuild::build_layer(DetElement parent, Volume parentVol, dd4hep::Sensiti
// on top of the following one, so new layerIn = old layerOut
//------------------------------------------------------------------------

sense_wire_radius_at_z_0 = layer_inner_radius_at_z_0 + 0.5 * delta_radius_layer;
sense_wire_radius_at_z_0 = radius_layer_0 + 0.5 * delta_radius_layer;
sign_epsilon *= -1;

layer_inner_radius_at_z_0 = layer_outer_radius_at_z_0;
Expand Down Expand Up @@ -444,14 +445,14 @@ void CDCHBuild::build_layer(DetElement parent, Volume parentVol, dd4hep::Sensiti
// Next, fill the geometry parameters of the central layer.
//------------------------------------------------------------------------

iradius = layer_inner_radius_at_z_0;
layer_inner_radius_at_z_0 += delta_radius_layer;
drop = layer_inner_radius_at_z_0 * dropFactor;
iradius = radius_layer_0;
radius_layer_0 += delta_radius_layer;
drop = radius_layer_0 * dropFactor;

layer_inner_radius_at_z_0 = layer_outer_radius_at_z_0;
layer_inner_radius_at_z_end = layer_outer_radius_at_z_end;
epsilonIn = epsilonOut;
layer_outer_radius_at_z_0 = layer_inner_radius_at_z_0 - FWireDiameter - 2.0 * secure;
layer_outer_radius_at_z_0 = radius_layer_0 - FWireDiameter - 2.0 * secure;
layer_outer_radius_at_z_end = layer_outer_radius_at_z_0 + drop;
epsilonOut = atan(sqrt(diff_of_squares(layer_outer_radius_at_z_end, layer_outer_radius_at_z_0)) / halflength);
zlength = halflength;
Expand Down Expand Up @@ -658,7 +659,7 @@ void CDCHBuild::build_layer(DetElement parent, Volume parentVol, dd4hep::Sensiti
layer_inner_radius_at_z_0 = layer_outer_radius_at_z_0;
layer_inner_radius_at_z_end = layer_outer_radius_at_z_end;
epsilonIn = epsilonOut;
layer_outer_radius_at_z_0 = layer_inner_radius_at_z_0 + FWireDiameter + 2.0 * secure;
layer_outer_radius_at_z_0 = radius_layer_0 + FWireDiameter + 2.0 * secure;
layer_outer_radius_at_z_end = layer_outer_radius_at_z_0 + drop;
epsilonOut = atan(sqrt(diff_of_squares(layer_outer_radius_at_z_end, layer_outer_radius_at_z_0)) / halflength);

Expand Down Expand Up @@ -697,7 +698,7 @@ void CDCHBuild::build_layer(DetElement parent, Volume parentVol, dd4hep::Sensiti
layer_inner_radius_at_z_0 = layer_outer_radius_at_z_0;
layer_inner_radius_at_z_end = layer_outer_radius_at_z_end;
epsilonIn = epsilonOut;
layer_outer_radius_at_z_0 = layer_inner_radius_at_z_0 + FWireDiameter + 2.0 * secure;
layer_outer_radius_at_z_0 = radius_layer_0 + FWireDiameter + 2.0 * secure;
layer_outer_radius_at_z_end = layer_outer_radius_at_z_0 + drop;
epsilonOut = atan(sqrt(diff_of_squares(layer_outer_radius_at_z_end, layer_outer_radius_at_z_0)) / halflength);

Expand Down

0 comments on commit 6faa225

Please sign in to comment.