Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions include/DataHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ class DataHandler {
float timeframe_duration,
float bunch_crossing_period,
float global_phase,
size_t crossings_per_rev,
const std::vector<bool>& bunch_pattern,
std::mt19937& gen) final;

/**
Expand Down
8 changes: 5 additions & 3 deletions include/DataSource.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class DataSource {
// Event loading and time offset update
virtual void loadEvent(size_t event_index) = 0;
void UpdateTimeOffset(float timeframe_duration, float bunch_crossing_period,
float global_phase, std::mt19937& rng);
float global_phase, const std::vector<float>& populated_crossing_times, std::mt19937& rng);

// Configuration access
const SourceConfig& getConfig() const { return *config_; }
Expand Down Expand Up @@ -81,6 +81,8 @@ class DataSource {
float calculateBeamDistance() const;

// Shared time offset generation logic
float generateTimeOffset(float distance, float timeframe_duration,
float bunch_crossing_period, float global_phase, std::mt19937& rng) const;
float generateTimeOffset(float distance, float timeframe_duration,
float bunch_crossing_period, float global_phase,
const std::vector<float>& populated_crossing_times,
std::mt19937& rng) const;
};
9 changes: 7 additions & 2 deletions include/MergerConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <string>
#include <vector>


struct SourceConfig {
// Input/output configuration
std::vector<std::string> input_files;
Expand Down Expand Up @@ -36,10 +35,16 @@ struct SourceConfig {
struct MergerConfig {
bool introduce_offsets{true};
float timeframe_duration{2000.0f};
float bunch_crossing_period{10.0f};
float bunch_crossing_period{10.152f};
float global_phase{0.5f};
size_t crossings_per_rev{1260};
size_t abort_gap{100};
size_t filled_crossings{1};
unsigned int random_seed{0}; // 0 means use random_device

// Bunch Pattern
std::vector<bool> bunch_pattern;

// Config per source
std::vector<SourceConfig> sources;

Expand Down
60 changes: 56 additions & 4 deletions src/CommandLineParser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ void CommandLineParser::printUsage(const char* program_name) {
<< " -o, --output FILE Output file name (default: merged_timeframes.edm4hep.root)\n"
<< " -n, --nevents N Maximum number of timeframes to generate (default: 100)\n"
<< " -d, --duration TIME Timeframe duration in ns (default: 20.0)\n"
<< " -p, --bunch-period PERIOD Bunch crossing period in ns (default: 10.0)\n"
<< " -g, --global-phase Global phase adjustment in fraction of a crossing period (default: 0.0)\n"
<< " -p, --bunch-period PERIOD Bunch crossing period in ns (default: 10.152)\n"
<< " -g, --global-phase PHASE Global phase adjustment in fraction of a crossing period (default: 0.5)\n"
<< " -r, --crossings-per-rev N Number of bunch crossings per revolution (default: 1260)\n"
<< " -a, --abort-gap N Abort gap size in bunch crossings (default: 100)\n"
<< " -l, --filled-crossings N Every N bunches filled (default: N=1 every crossing)\n"
<< " --random-seed SEED Random number generator seed (default: 0, use random_device)\n"
<< " --writer BACKEND Output writer: 'root' (TTree, default)\n"
<< " -h, --help Show this help message\n"
Expand Down Expand Up @@ -196,6 +199,9 @@ void CommandLineParser::loadYAMLConfig(const std::string& config_file, MergerCon
if (yaml["timeframe_duration"]) config.timeframe_duration = yaml["timeframe_duration"].as<float>();
if (yaml["bunch_crossing_period"]) config.bunch_crossing_period = yaml["bunch_crossing_period"].as<float>();
if (yaml["global_phase"]) config.global_phase = yaml["global_phase"].as<float>();
if (yaml["crossings_per_rev"]) config.crossings_per_rev = yaml["crossings_per_rev"].as<size_t>();
if (yaml["abort_gap"]) config.abort_gap = yaml["abort_gap"].as<size_t>();
if (yaml["filled_crossings"]) config.filled_crossings = yaml["filled_crossings"].as<size_t>();
if (yaml["random_seed"]) config.random_seed = yaml["random_seed"].as<unsigned int>();
if (yaml["introduce_offsets"]) config.introduce_offsets = yaml["introduce_offsets"].as<bool>();

Expand Down Expand Up @@ -314,6 +320,20 @@ void CommandLineParser::validateConfiguration(MergerConfig& config) {
if (config.sources.empty()) {
throw std::runtime_error("Error: No valid sources with input files specified");
}

// Check the bunch pattern - it must have at least one valid crossing
bool pattern_valid = false;
for(size_t i=0; i<config.crossings_per_rev; i++){
if(config.bunch_pattern[i]) {
pattern_valid = true;
break;
}
}

if(!pattern_valid){
throw std::runtime_error("Error: bunch_pattern has no valid entries");
}

}

void CommandLineParser::printConfiguration(const MergerConfig& config) {
Expand Down Expand Up @@ -344,6 +364,9 @@ void CommandLineParser::printConfiguration(const MergerConfig& config) {
std::cout << "Timeframe duration: " << config.timeframe_duration << " ns" << std::endl;
std::cout << "Bunch crossing period: " << config.bunch_crossing_period << " ns" << std::endl;
std::cout << "Crossing global phase: " << config.global_phase << std::endl;
std::cout << "Crossings per revolution: " << config.crossings_per_rev << std::endl;
std::cout << "Abort gap: " << config.abort_gap << " crossings" << std::endl;
std::cout << "Filled Crossings: " << config.filled_crossings << std::endl;
std::cout << "Random seed: " << config.random_seed << (config.random_seed == 0 ? " (using random_device)" : "") << std::endl;
std::cout << "Introduce offsets: " << (config.introduce_offsets ? "true" : "false") << std::endl;
std::cout << "Writer backend: " << config.writer << std::endl;
Expand Down Expand Up @@ -394,7 +417,10 @@ MergerConfig CommandLineParser::parse(int argc, char* argv[]) {
{"duration", required_argument, 0, 'd'},
{"frequency", required_argument, 0, 'f'},
{"bunch-period", required_argument, 0, 'p'},
{"global-phase", required_argument, 0, 'p'},
{"global-phase", required_argument, 0, 'g'},
{"crossings-per-rev", required_argument, 0, 'r'},
{"abort-gap", required_argument, 0, 'a'},
{"filled-crossings", required_argument, 0, 'l'},
{"random-seed", required_argument, 0, 1005},
{"use-bunch-crossing", no_argument, 0, 'b'},
{"static-events", no_argument, 0, 's'},
Expand All @@ -413,7 +439,7 @@ MergerConfig CommandLineParser::parse(int argc, char* argv[]) {
int opt;
int option_index = 0;

while ((opt = getopt_long(new_argc, new_argv, "o:n:d:f:p:bse:hv", long_options, &option_index)) != -1) {
while ((opt = getopt_long(new_argc, new_argv, "o:n:d:f:p:g:r:a:l:bse:hv", long_options, &option_index)) != -1) {
switch (opt) {
case 1004:
config_file = optarg;
Expand All @@ -433,6 +459,18 @@ MergerConfig CommandLineParser::parse(int argc, char* argv[]) {
case 'p':
config.bunch_crossing_period = std::stof(optarg);
break;
case 'g':
config.global_phase = std::stof(optarg);
break;
case 'r':
config.crossings_per_rev = std::stoul(optarg);
break;
case 'a':
config.abort_gap = std::stoul(optarg);
break;
case 'l':
config.filled_crossings = std::stoul(optarg);
break;
case 'b':
default_source.use_bunch_crossing = true;
break;
Expand Down Expand Up @@ -496,11 +534,25 @@ MergerConfig CommandLineParser::parse(int argc, char* argv[]) {
config.sources.push_back(default_source);
}

// Generate bunch pattern
config.bunch_pattern.assign(config.crossings_per_rev, false);
size_t scaledn = 0;
for(size_t i=0; i<config.crossings_per_rev; i++){
if( i<(config.crossings_per_rev-config.abort_gap) ){ // abort gap always empty
scaledn++;
if(scaledn==config.filled_crossings){
scaledn=0;
config.bunch_pattern[i] = true;
}
}
}

// Validate configuration
validateConfiguration(config);

// Print configuration
printConfiguration(config);


return config;
}
36 changes: 33 additions & 3 deletions src/DataHandler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,51 @@ void DataHandler::mergeEvents(std::vector<std::unique_ptr<DataSource>>& sources,
float timeframe_duration,
float bunch_crossing_period,
float global_phase,
size_t crossings_per_rev,
const std::vector<bool>& bunch_pattern,
std::mt19937& gen) {
current_timeframe_number_ = timeframe_number;


// randomly select the starting crossing position for the timeframe
std::uniform_int_distribution<size_t> uniform(0,(int)crossings_per_rev-1);
int start_crossing = uniform(gen);

// Create a map of populated crossings in the timeframe
int cnt = start_crossing;
int cnt_total = 0;
int crossings_in_timeframe = std::floor(timeframe_duration/bunch_crossing_period);
std::vector<float> populated_crossing_times; // start time of populated crossings
do{
if(bunch_pattern[cnt]) populated_crossing_times.push_back(cnt_total*bunch_crossing_period);
cnt++;
if(cnt>=crossings_per_rev) cnt = 0;
cnt_total++;
}while(cnt_total<crossings_in_timeframe);

double live_fraction = double(populated_crossing_times.size())/crossings_in_timeframe;

size_t total_events_consumed = 0;
// Iterate over all sources
for (auto& source : sources) {
const auto& config = source->getConfig();
size_t entries_needed = source->getEntriesNeeded();

size_t entries_needed;
if (config.already_merged || config.static_number_of_events)
entries_needed = source->getEntriesNeeded();
else{
if(config.attach_to_beam || config.use_bunch_crossing)
entries_needed = std::poisson_distribution<>(timeframe_duration * live_fraction * config.mean_event_frequency)(gen);
else
entries_needed = source->getEntriesNeeded();
}
int events_consumed = 0;

// Process each event from this source
for (size_t entry = 0; entry < entries_needed; ++entry) {
// Load and prepare the event
source->loadEvent(source->getCurrentEntryIndex());
source->UpdateTimeOffset(timeframe_duration, bunch_crossing_period, global_phase, gen);
source->UpdateTimeOffset(timeframe_duration, bunch_crossing_period, global_phase,
populated_crossing_times, gen);

// Call format-specific processing
processEvent(*source);
Expand Down
37 changes: 28 additions & 9 deletions src/DataSource.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
void DataSource::UpdateTimeOffset(float timeframe_duration,
float bunch_crossing_period,
float global_phase,
const std::vector<float>& populated_crossing_times,
std::mt19937& rng) {
float distance = 0.0f;

Expand All @@ -13,33 +14,51 @@ void DataSource::UpdateTimeOffset(float timeframe_duration,
distance = calculateBeamDistance();
}

current_time_offset_ = generateTimeOffset(distance, timeframe_duration, bunch_crossing_period, global_phase, rng);
current_time_offset_ = generateTimeOffset(distance, timeframe_duration, bunch_crossing_period, global_phase,
populated_crossing_times, rng);
}

float DataSource::generateTimeOffset(float distance, float timeframe_duration,
float bunch_crossing_period, float global_phase, std::mt19937& rng) const {
float DataSource::generateTimeOffset(float distance, float timeframe_duration, float bunch_crossing_period, float global_phase,
const std::vector<float>& populated_crossing_times, std::mt19937& rng) const {
const auto& config = getConfig();

std::uniform_real_distribution<float> uniform(0.0f, timeframe_duration);
float time_offset = uniform(rng);

float time_offset = 0.0;

if((populated_crossing_times.size()>0)&&(!config.already_merged && (config.use_bunch_crossing||config.attach_to_beam))){
// constrain times to populated crossings
std::uniform_int_distribution<int> uniform_int(0, populated_crossing_times.size()-1);
time_offset = populated_crossing_times[uniform_int(rng)];
}
else{
// randomize within the timeframe window
std::uniform_real_distribution<float> uniform(0, timeframe_duration);
time_offset = uniform(rng);
}

if (!config.already_merged) {

// Apply bunch crossing if enabled
if (config.use_bunch_crossing) {
time_offset = std::floor(time_offset / bunch_crossing_period) * bunch_crossing_period + global_phase * bunch_crossing_period;
time_offset += (global_phase * bunch_crossing_period);
}
// Apply beam effects if enabled
if (config.attach_to_beam) {

// randomize within the bunch_crossing_period
std::uniform_real_distribution<float> uniform(0, bunch_crossing_period);
time_offset += uniform(rng);

// Add time offset based on distance along beam
time_offset += distance / config.beam_speed + global_phase * bunch_crossing_period;
time_offset += distance / config.beam_speed + (global_phase * bunch_crossing_period);

// Add Gaussian spread if specified
if (config.beam_spread > 0.0f) {
std::normal_distribution<float> spread_dist(0.0f, config.beam_spread);
time_offset += spread_dist(rng);
}
}

}

return time_offset;
Expand Down
3 changes: 3 additions & 0 deletions src/HepMC3DataHandler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ std::shared_ptr<HepMC3::GenRunInfo> HepMC3DataHandler::configureMetadata(const M
runInfo->add_attribute(metadata_prefix + "timeframe_duration_ns", std::make_shared<HepMC3::StringAttribute>(std::to_string(config.timeframe_duration)));
runInfo->add_attribute(metadata_prefix + "bunch_crossing_period_ns", std::make_shared<HepMC3::StringAttribute>(std::to_string(config.bunch_crossing_period)));
runInfo->add_attribute(metadata_prefix + "global_phase", std::make_shared<HepMC3::StringAttribute>(std::to_string(config.global_phase)));
runInfo->add_attribute(metadata_prefix + "crossings_per_rev", std::make_shared<HepMC3::StringAttribute>(std::to_string(config.crossings_per_rev)));
runInfo->add_attribute(metadata_prefix + "abort_gap", std::make_shared<HepMC3::StringAttribute>(std::to_string(config.abort_gap)));
runInfo->add_attribute(metadata_prefix + "filled_crossings", std::make_shared<HepMC3::StringAttribute>(std::to_string(config.filled_crossings)));
runInfo->add_attribute(metadata_prefix + "max_events", std::make_shared<HepMC3::StringAttribute>(std::to_string(config.max_events)));
runInfo->add_attribute(metadata_prefix + "random_seed", std::make_shared<HepMC3::StringAttribute>(std::to_string(config.random_seed)));

Expand Down
3 changes: 2 additions & 1 deletion src/TimeframeBuilder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ void TimeframeBuilder::run() {
// Merge events from all sources
data_handler_->mergeEvents(
data_sources_, events_generated, m_config.timeframe_duration,
m_config.bunch_crossing_period, m_config.global_phase, gen);
m_config.bunch_crossing_period, m_config.global_phase, m_config.crossings_per_rev,
m_config.bunch_pattern, gen);

// Write the timeframe
data_handler_->writeTimeframe();
Expand Down
Loading