Skip to content

feat: New warm MS option Stellatryon v.2 added #1011

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

Open
Gfrisella wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: New warm MS option Stellatryon v.2 added #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ jobs:
matrix:
vessel_option: [vacuums, helium]
SND_option: [all]
muon_shield: [warm_opt, New_HA_Design]
target: [old, Jun25]
muon_shield: [TRY_2025]
target: [Jun25]

steps:
- name: Checkout
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@ it in future.

### Added

### Changed
* New warm MS option TRY_2025 (Stellatryon v.2) added to the config and its field map

### Changed

* Change function SND in shipDet_conf.py
* Cahnge disable magnetic field in the MS and remove field map upload in run_fixedTarget.py
* Change the ShipMuonShield script to accept new magnet configuration: no fixed number of magnets and variable z-gap between them.
* Change naming convention for simulation files to `{sim,geo,params}_{uuid4}.root`, with optional `--tag` parameter to specify custom identifier

### Fixed
Expand All @@ -27,6 +31,9 @@ it in future.

### Removed

* New_HA_Design and warm_opt muon shield configuration are no longer supported
* CI check for old target version

## 25.12 - 2025-12-22

### Added
Expand Down
3 changes: 3 additions & 0 deletions files/TRY_2025.root
View file
Open in desktop
Git LFS file not shown
14 changes: 6 additions & 8 deletions macro/run_fixedTarget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def get_work_dir(run_number,tag=None):
ap.add_argument('-o', '--output', type=str, help="output directory", dest='work_dir', default=None)
ap.add_argument('-rs', '--seed', type=int, help="random seed; default value is 0, see TRrandom::SetSeed documentation", default=0)
ap.add_argument('--DecayVolumeMedium', help='Set Decay Volume Medium. Choices are helium (default) or vacuums.', default='helium', choices=['helium', 'vacuums'])
ap.add_argument('--shieldName', help='Name of the shield in the database. New_HA_Design or warm_opt.', default='New_HA_Design', choices=['New_HA_Design', 'warm_opt'])
ap.add_argument('--shieldName', help='Name of the shield in the database. TRY_2025.', default='TRY_2025', choices=['TRY_2025'])
ap.add_argument('--AddMuonShield', help='Whether or not to add the muon shield. Default set to False.', default=False, action=argparse.BooleanOptionalAction)
ap.add_argument('--AddMuonShieldField', help='Whether or not to add the muon shield magnetic field. Default set to False.', default=False, action=argparse.BooleanOptionalAction)
ap.add_argument('--AddHadronAbsorberOnly', help='Whether to only add the hadron absorber part of the muon shield. Default set to True.', default=True, action=argparse.BooleanOptionalAction)
Expand Down Expand Up @@ -190,16 +190,14 @@ def get_work_dir(run_number,tag=None):


if args.AddMuonShield or args.AddHadronAbsorberOnly:
n_magnets = 7
n_params = 13
n_params = 15
if not args.AddMuonShieldField:
for i in range(n_magnets):
ship_geo.muShield.params[n_magnets + i * n_params + 12] = 0 # set B field to 0
for i in range(ship_geo.muShield.nMagnets):
ship_geo.muShield.params[i * n_params + 14] = 0 # set B field to 0
if args.AddHadronAbsorberOnly:
for i in range(1, n_magnets):
ship_geo.muShield.params[n_magnets + i * n_params] = 0 # set dXIn to 0
ship_geo.muShield.params = ship_geo.muShield.params[:15] # set dXIn to 0

MuonShield = ROOT.ShipMuonShield(in_params=list(ship_geo.muShield.params), z=ship_geo.muShield.z, WithConstShieldField=ship_geo.muShield.WithConstField,
MuonShield = ROOT.ShipMuonShield(in_params=list(ship_geo.muShield.params), z=ship_geo.muShield.z, WithConstShieldField=True,
SC_key=ship_geo.SC_mag)
# MuonShield.SetSupports(False) # otherwise overlap with sensitive Plane
run.AddModule(MuonShield) # needs to be added because of magn hadron shield.
Expand Down
2 changes: 1 addition & 1 deletion macro/run_simScript.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
parser.add_argument("-t", "--test", dest="testFlag", help="quick test", action="store_true")
parser.add_argument("--dry-run", dest="dryrun", help="stop after initialize", action="store_true")
parser.add_argument("-D", "--display", dest="eventDisplay", help="store trajectories", action="store_true")
parser.add_argument("--shieldName", help="The name of the muon shield in the database to use.", default="New_HA_Design", choices=["New_HA_Design", "warm_opt"])
parser.add_argument("--shieldName", help="The name of the muon shield in the database to use.", default="TRY_2025", choices=["TRY_2025"])
parser.add_argument("--MesonMother", dest="MM", help="Choose DP production meson source: pi0, eta, omega, eta1, eta11", default='pi0')
parser.add_argument("--debug", help="Control FairLogger verbosity: 0=info (default), 1=+debug, 2=+debug1, 3=+debug2", default=0, type=int, choices=range(0,4))
parser.add_argument("--print-fields", help="Print VMC fields and weights information", action="store_true")
Expand Down
167 changes: 89 additions & 78 deletions passive/ShipMuonShield.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ ShipMuonShield::ShipMuonShield(std::vector<double> in_params, Double_t z,
const Bool_t WithConstShieldField,
const Bool_t SC_key)
: FairModule("MuonShield", "ShipMuonShield") {
LOG(debug) << " Function ShipMuonShield MS ";
for (size_t i = 0; i < in_params.size(); i++) {
shield_params.push_back(in_params[i]);
}
nParams = 15;
nMagnets = in_params.size() / nParams; // integer division

if (in_params.size() % 15 != 0) {
LOG(error) << "Warning: incomplete magnet data!";
}

fWithConstShieldField = WithConstShieldField;
fSC_mag = SC_key;
dZ1 = in_params[0];
dZ2 = in_params[1];
dZ3 = in_params[2];
dZ4 = in_params[3];
dZ5 = in_params[4];
dZ6 = in_params[5];
dZ7 = in_params[6];
fMuonShieldHalfLength = dZ1 + dZ2 + dZ3 + dZ4 + dZ5 + dZ6 + dZ7;
z_end_of_proximity_shielding = z;
}

Expand Down Expand Up @@ -83,9 +83,17 @@ void ShipMuonShield::CreateArb8(TString arbName, TGeoMedium* medium,
Double_t z_translation) {
TGeoVolume* magVol = nullptr;

if (snd_hole &&
((arbName == "Magn6_MiddleMagL" || arbName == "Magn6_MiddleMagR") ||
(arbName == "Magn5_MiddleMagL" || arbName == "Magn5_MiddleMagR"))) {
LOG(debug) << " Create CreateArb8 of the MS ";

TString magnLast = Form("Magn%zu", nMagnets - 1);
TString magnPrev = Form("Magn%zu", nMagnets - 2);

bool snd_magnet = (arbName == magnLast + "_MiddleMagL") ||
(arbName == magnLast + "_MiddleMagR") ||
(arbName == magnPrev + "_MiddleMagL") ||
(arbName == magnPrev + "_MiddleMagR");

if (snd_hole && snd_magnet) {
//
// 1) Raw Arb8 “shape”
//
Expand Down Expand Up @@ -120,6 +128,7 @@ void ShipMuonShield::CreateArb8(TString arbName, TGeoMedium* medium,
//
// 5) Wrap the composite in a volume
//
LOG(debug) << " Create CreateArb8 of the MS 5";
magVol = new TGeoVolume(arbName, compShape, medium);
} else {
// original uncut magnet
Expand All @@ -143,6 +152,7 @@ void ShipMuonShield::CreateMagnet(
Double_t ratio_yoke_2, Double_t dY_yoke_1, Double_t dY_yoke_2, Double_t dZ,
Double_t middleGap, Double_t middleGap2, Double_t gap, Double_t gap2,
Double_t Z, Bool_t NotMagnet, Bool_t SC_key = false) {
LOG(debug) << " Create a magnet of the MS ";
Double_t coil_gap, coil_gap2;
Int_t color[4] = {45, 31, 30, 38};
gap = std::ceil(std::max(100. / dY, gap));
Expand Down Expand Up @@ -312,31 +322,31 @@ void ShipMuonShield::CreateMagnet(
break;
}
}

Int_t ShipMuonShield::Initialize(
void ShipMuonShield::Initialize(
std::vector<TString>& magnetName,
std::vector<FieldDirection>& fieldDirection, std::vector<Double_t>& dXIn,
std::vector<Double_t>& dYIn, std::vector<Double_t>& dXOut,
std::vector<Double_t>& dYOut, std::vector<Double_t>& ratio_yokesIn,
std::vector<Double_t>& ratio_yokesOut, std::vector<Double_t>& dY_yokeIn,
std::vector<Double_t>& dY_yokeOut, std::vector<Double_t>& dZ,
std::vector<Double_t>& midGapIn, std::vector<Double_t>& midGapOut,
std::vector<Double_t>& Bgoal, std::vector<Double_t>& gapIn,
std::vector<Double_t>& gapOut, std::vector<Double_t>& Z) {
const Int_t nMagnets = 7;
LOG(info) << " Initialize the MS ";
std::vector<Double_t>& Z_rel, std::vector<Double_t>& midGapIn,
std::vector<Double_t>& midGapOut, std::vector<Double_t>& Bgoal,
std::vector<Double_t>& gapIn, std::vector<Double_t>& gapOut,
std::vector<Double_t>& Z) {
LOG(debug) << " Initialize the MS ";
magnetName.reserve(nMagnets);
fieldDirection.reserve(nMagnets);
for (auto i : {&dXIn, &dXOut, &dYIn, &dYOut, &dZ, &midGapIn, &midGapOut,
&ratio_yokesIn, &ratio_yokesOut, &dY_yokeIn, &dY_yokeOut,
&Bgoal, &gapIn, &gapOut, &Z}) {
for (auto i : {&dXIn, &dXOut, &dYIn, &dYOut, &dZ, &Z_rel, &midGapIn,
&midGapOut, &ratio_yokesIn, &ratio_yokesOut, &dY_yokeIn,
&dY_yokeOut, &Bgoal, &gapIn, &gapOut, &Z}) {
i->reserve(nMagnets);
}

Double_t z_gap = 10 * cm; // fixed distance between magnets in Z-axis

magnetName = {"MagnAbsorb", "Magn1", "Magn2", "Magn3",
"Magn4", "Magn5", "Magn6"};
magnetName.push_back("MagnAbsorb");
for (size_t i = 1; i < nMagnets; ++i) {
TString name = Form("Magn%zu", i);
magnetName.push_back(name);
LOG(debug) << "magnet i: " << name;
}

fieldDirection = {FieldDirection::up, FieldDirection::up,
FieldDirection::up, FieldDirection::up,
Expand All @@ -346,66 +356,68 @@ Int_t ShipMuonShield::Initialize(
std::vector<Double_t> params;
params = shield_params;

const int offset = nMagnets;
const int nParams = 13;

for (Int_t i = 0; i < nMagnets; ++i) {
dXIn[i] = params[offset + i * nParams + 0];
dXOut[i] = params[offset + i * nParams + 1];
dYIn[i] = params[offset + i * nParams + 2];
dYOut[i] = params[offset + i * nParams + 3];
gapIn[i] = params[offset + i * nParams + 4];
gapOut[i] = params[offset + i * nParams + 5];
ratio_yokesIn[i] = params[offset + i * nParams + 6];
ratio_yokesOut[i] = params[offset + i * nParams + 7];
dY_yokeIn[i] = params[offset + i * nParams + 8];
dY_yokeOut[i] = params[offset + i * nParams + 9];
midGapIn[i] = params[offset + i * nParams + 10];
midGapOut[i] = params[offset + i * nParams + 11];
Bgoal[i] = params[offset + i * nParams + 12];
for (size_t i = 0; i < nMagnets; ++i) {
// --- Load parameters for each magnet ---

dZ[i] = params[i * nParams + 0];
Z_rel[i] = params[i * nParams + 1];
dXIn[i] = params[i * nParams + 2];
dXOut[i] = params[i * nParams + 3];
dYIn[i] = params[i * nParams + 4];
dYOut[i] = params[i * nParams + 5];
gapIn[i] = params[i * nParams + 6];
gapOut[i] = params[i * nParams + 7];
ratio_yokesIn[i] = params[i * nParams + 8];
ratio_yokesOut[i] = params[i * nParams + 9];
dY_yokeIn[i] = params[i * nParams + 10];
dY_yokeOut[i] = params[i * nParams + 11];
midGapIn[i] = params[i * nParams + 12];
midGapOut[i] = params[i * nParams + 13];
Bgoal[i] = params[i * nParams + 14];

// --- Compute Z position for each magnet ---
if (i == 0) {
// First magnet uses the initial offset
Z[i] = z_end_of_proximity_shielding + dZ[i] + Z_rel[i];
} else {
// Subsequent magnets are placed relative to the previous one
Z[i] = Z[i - 1] + Z_rel[i - 1] + dZ[i] + Z_rel[i];
}
// --- Print all values for this magnet ---
LOG(debug) << "Magnet " << i << ": dZ=" << dZ[i] << ", Z_rel=" << Z_rel[i]
<< ", dXIn=" << dXIn[i] << ", dXOut=" << dXOut[i]
<< ", dYIn=" << dYIn[i] << ", dYOut=" << dYOut[i]
<< ", gapIn=" << gapIn[i] << ", gapOut=" << gapOut[i]
<< ", ratio_yokesIn=" << ratio_yokesIn[i]
<< ", ratio_yokesOut=" << ratio_yokesOut[i]
<< ", dY_yokeIn=" << dY_yokeIn[i]
<< ", dY_yokeOut=" << dY_yokeOut[i]
<< ", midGapIn=" << midGapIn[i] << ", midGapOut=" << midGapOut[i]
<< ", Bgoal=" << Bgoal[i] << ", Z=" << Z[i];
}

dZ[0] = dZ1 - z_gap / 2;
Z[0] = z_end_of_proximity_shielding + dZ[0] + z_gap;
dZ[1] = dZ2 - z_gap / 2;
Z[1] = Z[0] + dZ[0] + dZ[1] + z_gap;
dZ[2] = dZ3 - z_gap / 2;
Z[2] = Z[1] + dZ[1] + dZ[2] + 2 * z_gap;
dZ[3] = dZ4 - z_gap / 2;
Z[3] = Z[2] + dZ[2] + dZ[3] + z_gap;
dZ[4] = dZ5 - z_gap / 2;
Z[4] = Z[3] + dZ[3] + dZ[4] + z_gap;
dZ[5] = dZ6 - z_gap / 2;
Z[5] = Z[4] + dZ[4] + dZ[5] + z_gap;
dZ[6] = dZ7 - z_gap / 2;
Z[6] = Z[5] + dZ[5] + dZ[6] + z_gap;

return nMagnets;
LOG(debug) << " ending of Initialize the MS ";
}
void ShipMuonShield::ConstructGeometry() {
LOG(debug) << " Construct Geometry of the MS ";
TGeoVolume* top = gGeoManager->GetTopVolume();
TGeoVolume* tShield = new TGeoVolumeAssembly("MuonShieldArea");
InitMedium("iron");
TGeoMedium* iron = gGeoManager->GetMedium("iron");

std::vector<TString> magnetName;
std::vector<FieldDirection> fieldDirection;
std::vector<Double_t> dXIn, dYIn, dXOut, dYOut, dZf, midGapIn, midGapOut,
ratio_yokesIn, ratio_yokesOut, dY_yokeIn, dY_yokeOut, gapIn, gapOut,
Bgoal, Z;
const Int_t nMagnets =
Initialize(magnetName, fieldDirection, dXIn, dYIn, dXOut, dYOut,
ratio_yokesIn, ratio_yokesOut, dY_yokeIn, dY_yokeOut, dZf,
midGapIn, midGapOut, Bgoal, gapIn, gapOut, Z);

// Create TCC8 tunnel around muon shield

std::array<double, 7> fieldScale = {{1., 1., 1., 1., 1., 1., 1.}};
for (Int_t nM = 0; nM < (nMagnets); nM++) {
if (dZf[nM] < 1e-5 || dXIn[nM] == 0) {
std::vector<Double_t> dXIn, dYIn, dXOut, dYOut, dZf, Z_relf, midGapIn,
midGapOut, ratio_yokesIn, ratio_yokesOut, dY_yokeIn, dY_yokeOut, gapIn,
gapOut, Bgoal, Z;
Initialize(magnetName, fieldDirection, dXIn, dYIn, dXOut, dYOut,
ratio_yokesIn, ratio_yokesOut, dY_yokeIn, dY_yokeOut, dZf, Z_relf,
midGapIn, midGapOut, Bgoal, gapIn, gapOut, Z);

for (size_t nM = 0; nM < nMagnets; ++nM) {
if (Z_relf[nM] < 1e-5 || dXIn[nM] == 0) {
continue;
}
Double_t ironField_s = Bgoal[nM] * fieldScale[nM] * tesla;
Double_t ironField_s = Bgoal[nM] * tesla;
TGeoUniformMagField* magFieldIron_s =
new TGeoUniformMagField(0., ironField_s, 0.);
TGeoUniformMagField* RetField_s =
Expand All @@ -419,17 +431,16 @@ void ShipMuonShield::ConstructGeometry() {
// Create the magnet
CreateMagnet(magnetName[nM], iron, tShield, fields_s, fieldDirection[nM],
dXIn[nM], dYIn[nM], dXOut[nM], dYOut[nM], ratio_yokesIn[nM],
ratio_yokesOut[nM], dY_yokeIn[nM], dY_yokeOut[nM], dZf[nM],
ratio_yokesOut[nM], dY_yokeIn[nM], dY_yokeOut[nM], Z_relf[nM],
midGapIn[nM], midGapOut[nM], gapIn[nM], gapOut[nM], Z[nM],
nM == 0, nM == 3 && fSC_mag);
}

// Place in origin of SHiP coordinate system as subnodes placed correctly
top->AddNode(tShield, 1);

Double_t z_gap = 10 * cm;
Double_t absorber_offset = z_gap;
Double_t absorber_half_length = (dZf[0]);
Double_t absorber_offset = dZf[0];
Double_t absorber_half_length = (Z_relf[0]);

// Absorber

Expand Down
28 changes: 14 additions & 14 deletions passive/ShipMuonShield.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ class ShipMuonShield : public FairModule {
void SetSNDSpace(Bool_t hole, Double_t hole_dx, Double_t hole_dy);

protected:
Double_t fMuonShieldHalfLength; // FIXME: HA_field to be removed in the next
// workshop meeting
Double_t dZ0, dZ1, dZ2, dZ3, dZ4, dZ5, dZ6, dZ7, dXgap,
z_end_of_proximity_shielding;
size_t nMagnets;
Int_t InitMedium(TString name);
Int_t nParams;
Bool_t fWithConstShieldField;
Bool_t fSC_mag;
std::vector<Double_t> shield_params;
Expand All @@ -46,18 +46,18 @@ class ShipMuonShield : public FairModule {
Double_t x_translation, Double_t y_translation,
Double_t z_translation);

Int_t Initialize(std::vector<TString>& magnetName,
std::vector<FieldDirection>& fieldDirection,
std::vector<Double_t>& dXIn, std::vector<Double_t>& dYIn,
std::vector<Double_t>& dXOut, std::vector<Double_t>& dYOut,
std::vector<Double_t>& ratio_yokesIn,
std::vector<Double_t>& ratio_yokesOut,
std::vector<Double_t>& dY_yokeIn,
std::vector<Double_t>& dY_yokeOut, std::vector<Double_t>& dZ,
std::vector<Double_t>& midGapIn,
std::vector<Double_t>& midGapOut,
std::vector<Double_t>& Bgoal, std::vector<Double_t>& gapIn,
std::vector<Double_t>& gapOut, std::vector<Double_t>& Z);
void Initialize(std::vector<TString>& magnetName,
std::vector<FieldDirection>& fieldDirection,
std::vector<Double_t>& dXIn, std::vector<Double_t>& dYIn,
std::vector<Double_t>& dXOut, std::vector<Double_t>& dYOut,
std::vector<Double_t>& ratio_yokesIn,
std::vector<Double_t>& ratio_yokesOut,
std::vector<Double_t>& dY_yokeIn,
std::vector<Double_t>& dY_yokeOut, std::vector<Double_t>& dZ,
std::vector<Double_t>& Z_rel, std::vector<Double_t>& midGapIn,
std::vector<Double_t>& midGapOut,
std::vector<Double_t>& Bgoal, std::vector<Double_t>& gapIn,
std::vector<Double_t>& gapOut, std::vector<Double_t>& Z);

void CreateMagnet(TString magnetName, TGeoMedium* medium, TGeoVolume* tShield,
TGeoUniformMagField* fields[4],
Expand Down
Loading