diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4eaca870caf8f2223a6279496d0764dcc69a95a4..01ee584aa9bb534fcdda0bbd53c68f620838bcc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,11 +89,21 @@ track_test_1_dummy_test: - bash trackers/dummy_test.sh allow_failure: true -simple_tracking_test: +roman_pot_simu: + stage: simulate + tags: + - sodium + script: + - bash trackers/roman_pot_simu.sh + allow_failure: true + +roman_pot_benchmark: stage: benchmarks tags: - sodium script: + - cp NPDet/src/GenericDetectors/trackers/compact/elements.xml trackers/. + - cp NPDet/src/GenericDetectors/trackers/compact/materials.xml trackers/. - root -b -q trackers/simple_tracking.cxx+ allow_failure: true diff --git a/trackers/roman_pot.xml b/trackers/roman_pot.xml index 6db76136a4d1122692416e0af82eeb68403d6da0..f16715918ffd4849ea68ffc900a652fd8f4a9741 100644 --- a/trackers/roman_pot.xml +++ b/trackers/roman_pot.xml @@ -64,8 +64,8 @@ <detectors> <detector id = "1" name = "MyRomanPot" type = "RomanPot" readout = "ForwardRomanPotHits" vis = "InvisibleWithDaughters"> - <dimensions x = "3.0*cm" y = "3.0*cm" delta = "0.5*cm" /> - <frame x = "10.0*cm" y = "5.0*cm" z = "2*cm" /> + <dimensions x = "5.0*cm" y = "5.0*cm" delta = "0.05*mm" /> + <frame x = "20.0*cm" y = "10.0*cm" z = "2*cm" /> <position z_offset = "20.0*m" rotation = "false" vmax = "10*cm" v = "0.5*cm" /> <layer repeat = "5"> <slice material="Carbon" thickness="0.5*mm" vis = "BlueVis" /> diff --git a/trackers/roman_pot_simu.sh b/trackers/roman_pot_simu.sh index 5159f51f0c3472ed80a8d9224495ad7ead51a41c..91ea178467e326adb416010e459b42e7e6c1ed51 100755 --- a/trackers/roman_pot_simu.sh +++ b/trackers/roman_pot_simu.sh @@ -1,6 +1,6 @@ #!/bin/bash -ddsim --runType batch -N 100 \ +ddsim --runType batch -N 300 \ --inputFiles ../data/forward_ions.hepmc \ --compactFile ./roman_pot.xml \ - --outputFile ./roman_pot_out.root + --outputFile ../sim_output/roman_pot_out.root diff --git a/trackers/simple_tracking.cxx b/trackers/simple_tracking.cxx index 047ebb2f02a447648eccced1dc50d6b4be3d8278..b394bb91e6675025dceeaa7d8fab58d6d7f0a059 100644 --- a/trackers/simple_tracking.cxx +++ b/trackers/simple_tracking.cxx @@ -29,7 +29,7 @@ R__LOAD_LIBRARY(libDDG4IO.so) //#include "lcio2/TrackerRawDataData.h" //#include "lcio2/TrackerRawData.h" -void simple_tracking(const char* fname = "sim_output/roman_pot_out.root"){ +void simple_tracking(const char* fname = "../sim_output/roman_pot_out.root"){ ROOT::EnableImplicitMT(); // Tell ROOT you want to go parallel //using namespace lcio2;