Skip to content
Snippets Groups Projects
Commit 6dc28c27 authored by FaserMC's avatar FaserMC
Browse files

Add calo response fluctuation amplitude, update scripts for new global tags

parent 92a5d5c0
No related branches found
No related tags found
2 merge requests!379Waveform digi timing,!351Merging Muon code to create new Database tag
Hide whitespace changes
Inline Side-by-side
Showing
with 66 additions and 25 deletions
Calorimeter/CaloG4/EcalG4_SD/src/EcalSensorSDTool.cxx
+ 1
− 1
View file @ 6dc28c27
...@@ -21,7 +21,7 @@ EcalSensorSDTool::EcalSensorSDTool(const std::string& type, const std::string& n ...@@ -21,7 +21,7 @@ EcalSensorSDTool::EcalSensorSDTool(const std::string& type, const std::string& n
, m_birk_c1 ( 0.013 * CLHEP::g/CLHEP::MeV/CLHEP::cm2 ) // 1st coef. of Birk's , m_birk_c1 ( 0.013 * CLHEP::g/CLHEP::MeV/CLHEP::cm2 ) // 1st coef. of Birk's
, m_birk_c2 ( 9.6E-6 * CLHEP::g*CLHEP::g/CLHEP::MeV/CLHEP::MeV/CLHEP::cm2/CLHEP::cm2 ) // 2nd coef. of Birk's law , m_birk_c2 ( 9.6E-6 * CLHEP::g*CLHEP::g/CLHEP::MeV/CLHEP::MeV/CLHEP::cm2/CLHEP::cm2 ) // 2nd coef. of Birk's law
, m_birk_c1correction ( 0.57142857) //correction of c1 for 2e charged part. , m_birk_c1correction ( 0.57142857) //correction of c1 for 2e charged part.
, m_a_local_outer_ecal ( 0. ) , m_a_local_outer_ecal ( 0.01 )
, m_a_global_outer_ecal ( 0.03 ) // global non uniformity amplitude , m_a_global_outer_ecal ( 0.03 ) // global non uniformity amplitude
, m_a_reflection_height ( 0.09 ) // reflection on the edges - height , m_a_reflection_height ( 0.09 ) // reflection on the edges - height
, m_a_reflection_width ( 6. * CLHEP::mm ) // reflection on the edges - width , m_a_reflection_width ( 6. * CLHEP::mm ) // reflection on the edges - width
......
Control/CalypsoExample/Digitization/scripts/faser_digi.py
+ 8
− 4
View file @ 6dc28c27
...@@ -76,12 +76,16 @@ if runtype == "TI12OldMC": ...@@ -76,12 +76,16 @@ if runtype == "TI12OldMC":
# Testbeam setup # Testbeam setup
elif runtype == "TestBeamMC" : elif runtype == "TestBeamMC" :
ConfigFlags.GeoModel.FaserVersion = "FASER-TB00" ConfigFlags.GeoModel.FaserVersion = "FASER-TB01" # New geometry
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB01"
# New TI12 geometry (ugh) # New TI12 geometry (ugh)
elif runtype == "TI12MC": elif runtype == "TI12MC" or runtype == "TI12MC04":
ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" ConfigFlags.GeoModel.FaserVersion = "FASERNU-04" # New geometry
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04"
elif runtype == "TI12MC03":
ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # New geometry
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
else: else:
......
Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
+ 10
− 6
View file @ 6dc28c27
...@@ -186,17 +186,21 @@ if runtype == "TI12OldMC": ...@@ -186,17 +186,21 @@ if runtype == "TI12OldMC":
# Testbeam setup # Testbeam setup
elif runtype == "TestBeamMC" : elif runtype == "TestBeamMC" :
ConfigFlags.GeoModel.FaserVersion = "FASER-TB00" ConfigFlags.GeoModel.FaserVersion = "FASER-TB01" # New geometry
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB01"
# New TI12 geometry (ugh) # New TI12 geometry (ugh)
elif runtype == "TI12MC": elif runtype == "TI12MC" or runtype == "TI12MC04":
ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" ConfigFlags.GeoModel.FaserVersion = "FASERNU-04" # New geometry
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04"
elif runtype == "TI12MC03":
ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # New geometry
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
else: else:
print("Invalid run type found:", runtype) print("Invalid geometry type found:", runtype)
print("Specify correct type or update list") print("Specify correct geometry or update list")
sys.exit(-1) sys.exit(-1)
......
Control/CalypsoExample/Generation/scripts/faser_particlegun.py
+ 11
− 3
View file @ 6dc28c27
...@@ -72,7 +72,15 @@ if __name__ == '__main__': ...@@ -72,7 +72,15 @@ if __name__ == '__main__':
ConfigFlags.addFlag("Sim.Beam.xshift", 0) # Potential beam shift ConfigFlags.addFlag("Sim.Beam.xshift", 0) # Potential beam shift
ConfigFlags.addFlag("Sim.Beam.yshift", 0) ConfigFlags.addFlag("Sim.Beam.yshift", 0)
if args.geom == "TI12MC": if args.geom == "TI12MC" or args.geom == "TI12MC04":
# New TI12 geometry
ConfigFlags.GeoModel.FaserVersion = "FASERNU-04" # Geometry set-up
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04" # Conditions set-up
# TI12 detectors
detectors = ['Veto', 'VetoNu', 'Preshower', 'FaserSCT', 'Ecal', 'Trigger',
'Dipole', 'Emulsion', 'Trench']
elif args.geom == "TI12MC03":
# 2022 TI12 geometry # 2022 TI12 geometry
ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # Geometry set-up ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # Geometry set-up
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up
...@@ -82,8 +90,8 @@ if __name__ == '__main__': ...@@ -82,8 +90,8 @@ if __name__ == '__main__':
elif args.geom == "TestBeamMC": elif args.geom == "TestBeamMC":
# Define 2021 test beam geometry # Define 2021 test beam geometry
ConfigFlags.GeoModel.FaserVersion = "FASER-TB00" # Geometry set-up ConfigFlags.GeoModel.FaserVersion = "FASER-TB01" # Geometry set-up
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00" # Conditions set-up ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB01" # Conditions set-up
# Testbeam detectors (trigger layers are actually veto counters) # Testbeam detectors (trigger layers are actually veto counters)
detectors = ['Veto', 'Preshower', 'FaserSCT', 'Ecal'] detectors = ['Veto', 'Preshower', 'FaserSCT', 'Ecal']
......
Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
+ 13
− 4
View file @ 6dc28c27
...@@ -59,7 +59,7 @@ elif args.testBeam: ...@@ -59,7 +59,7 @@ elif args.testBeam:
else: else:
print(f"Assuming TI12 geometry") print(f"Assuming TI12 geometry")
runtype = "TI12Data03" runtype = "TI12Data04"
# Try to pick correct geometry from run number # Try to pick correct geometry from run number
# This won't work for testbeam data, # This won't work for testbeam data,
...@@ -74,7 +74,7 @@ else: ...@@ -74,7 +74,7 @@ else:
else: else:
if runnumber > 6700: # Not sure if this is exact if runnumber > 6700: # Not sure if this is exact
print(f"Found run number {runnumber}, using TI12 configuration with IFT+faserNu") print(f"Found run number {runnumber}, using TI12 configuration with IFT+faserNu")
runtype = "TI12Data03" runtype = "TI12Data04"
elif runnumber > 5302: # Last TI12 run on Nov. 23, 2021 without IFT elif runnumber > 5302: # Last TI12 run on Nov. 23, 2021 without IFT
print(f"Found run number {runnumber}, using TI12 configuration with IFT") print(f"Found run number {runnumber}, using TI12 configuration with IFT")
runtype = "TI12Data02" runtype = "TI12Data02"
...@@ -126,8 +126,9 @@ if runtype == "TI12Data": ...@@ -126,8 +126,9 @@ if runtype == "TI12Data":
# Testbeam setup # Testbeam setup
elif runtype == "TestBeamData" or runtype == "TestBeamMC": elif runtype == "TestBeamData" or runtype == "TestBeamMC":
ConfigFlags.GeoModel.FaserVersion = "FASER-TB00" ConfigFlags.GeoModel.FaserVersion = "FASER-TB01"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00" ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB01"
print("Set global tag to OFLCOND-FASER-TB01")
useCKF = False useCKF = False
useCal = True useCal = True
...@@ -144,6 +145,14 @@ elif runtype == "TI12Data03": ...@@ -144,6 +145,14 @@ elif runtype == "TI12Data03":
if not args.isMC: if not args.isMC:
useLHC = True useLHC = True
# Updated 2023 TI12 geometry
elif runtype == "TI12Data04":
ConfigFlags.GeoModel.FaserVersion = "FASERNU-04"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04"
useCal = True
if not args.isMC:
useLHC = True
else: else:
print("Invalid run type found:", runtype) print("Invalid run type found:", runtype)
print("Specify correct type or update list") print("Specify correct type or update list")
......
Control/CalypsoExample/Simulation/scripts/faser_simulate.py
+ 11
− 3
View file @ 6dc28c27
...@@ -146,9 +146,17 @@ if __name__ == '__main__': ...@@ -146,9 +146,17 @@ if __name__ == '__main__':
# #
# Figure out configuration # Figure out configuration
# #
if args.geom == "TI12MC": if args.geom == "TI12MC" or args.geom == "TI12MC04":
# 2022 TI12 geometry # New TI12 geometry
ConfigFlags.GeoModel.FaserVersion = "FASERNU-04" # Geometry set-up ConfigFlags.GeoModel.FaserVersion = "FASERNU-04" # Geometry set-up
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04" # Conditions set-up
# TI12 detectors
detectors = ['Veto', 'VetoNu', 'Preshower', 'FaserSCT', 'Ecal',
'Trigger', 'Dipole', 'Emulsion', 'Trench']
elif args.geom == "TI12MC03":
# Old TI12 geometry
ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # Geometry set-up
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up
# TI12 detectors # TI12 detectors
detectors = ['Veto', 'VetoNu', 'Preshower', 'FaserSCT', 'Ecal', detectors = ['Veto', 'VetoNu', 'Preshower', 'FaserSCT', 'Ecal',
...@@ -157,7 +165,7 @@ if __name__ == '__main__': ...@@ -157,7 +165,7 @@ if __name__ == '__main__':
elif args.geom == "TestBeamMC": elif args.geom == "TestBeamMC":
# Define 2021 test beam geometry # Define 2021 test beam geometry
ConfigFlags.GeoModel.FaserVersion = "FASER-TB01" # Geometry set-up ConfigFlags.GeoModel.FaserVersion = "FASER-TB01" # Geometry set-up
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00" # Conditions set-up ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB01" # Conditions set-up
# Testbeam detectors (trigger layers are actually veto counters) # Testbeam detectors (trigger layers are actually veto counters)
detectors = ['Veto', 'Preshower', 'FaserSCT', 'Ecal'] detectors = ['Veto', 'Preshower', 'FaserSCT', 'Ecal']
......
Control/CalypsoExample/Simulation/scripts/submit_faser_simulate.sh
+ 12
− 4
View file @ 6dc28c27
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
# Used with a condor file to submit to vanilla universe # Used with a condor file to submit to vanilla universe
# #
# Usage: # Usage:
# submit_faserMDC_simluate.sh [--shift] input_file output_file [release_directory] [working_directory] [skip] [nevts] # submit_faser_simluate.sh [--shift] input_file output_file [release_directory] [working_directory] [skip] [nevts]
# #
# Options: # Options:
# --shift - apply crossing angle (and FASER shift) # --shift - apply crossing angle (and FASER shift)
# --geom - specify geometry (default TI12)
# --out - specify output location (in EOS) to copy output HITS file # --out - specify output location (in EOS) to copy output HITS file
# --log - specify output location (in EOS) for log file # --log - specify output location (in EOS) for log file
# #
...@@ -40,6 +41,11 @@ do ...@@ -40,6 +41,11 @@ do
xangle=2 xangle=2
shift;; shift;;
-g | --geom)
geomstr="--geom $2";
shift;
shift;;
-l | --log) -l | --log)
logdest="$2"; logdest="$2";
shift; shift;
...@@ -148,6 +154,7 @@ echo "Output: $output_directory" ...@@ -148,6 +154,7 @@ echo "Output: $output_directory"
echo "Starting: $starting_directory" echo "Starting: $starting_directory"
echo "Skip: $skip_events" echo "Skip: $skip_events"
echo "Nevts: $nevts" echo "Nevts: $nevts"
echo "Geom: $geomstr"
# #
# Set up the release (do this automatically)? # Set up the release (do this automatically)?
export ATLAS_LOCAL_ROOT_BASE=/cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase export ATLAS_LOCAL_ROOT_BASE=/cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase
...@@ -186,15 +193,16 @@ cd "${file_stem}" ...@@ -186,15 +193,16 @@ cd "${file_stem}"
# Run job # Run job
#if [[ -z "$tag" ]]; then #if [[ -z "$tag" ]]; then
#fi #fi
#
if [[ -z "$xangle" ]]; then if [[ -z "$xangle" ]]; then
faser_simulate.py --skip "$skip_events" -n "$nevts" "$infile" "$outfile" faser_simulate.py $geomstr --skip "$skip_events" -n "$nevts" "$infile" "$outfile"
sim_code=$? sim_code=$?
elif [[ $xangle == 1 ]]; then elif [[ $xangle == 1 ]]; then
faser_simulate.py --yangle -0.000160 --yshift 12.0 --skip "$skip_events" -n "$nevts" "$infile" "$outfile" faser_simulate.py $geomstr --yangle -0.000160 --yshift 12.0 --skip "$skip_events" -n "$nevts" "$infile" "$outfile"
sim_code=$? sim_code=$?
else else
echo "Applying double crossing-angle shift for FLUKA!" echo "Applying double crossing-angle shift for FLUKA!"
faser_simulate.py --yangle -0.000310 --yshift 12.0 --skip "$skip_events" -n "$nevts" "$infile" "$outfile" faser_simulate.py $geomstr --yangle -0.000310 --yshift 12.0 --skip "$skip_events" -n "$nevts" "$infile" "$outfile"
sim_code=$? sim_code=$?
fi fi
echo "Return code: $sim_code" echo "Return code: $sim_code"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment