From c0e41bd941094a905d38f34b191d372fd2579105 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Mon, 8 Apr 2024 08:50:30 +0200 Subject: [PATCH] code cleanup --- src/mergeVBF.cpp | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/src/mergeVBF.cpp b/src/mergeVBF.cpp index 9dcdb38a..20e17641 100644 --- a/src/mergeVBF.cpp +++ b/src/mergeVBF.cpp @@ -23,7 +23,6 @@ #include using namespace std; - using namespace VConfigMaskUtil; @@ -91,22 +90,16 @@ int main( int argc, char** argv ) try { - - //VBankFileReader reader(fileNames.at(fileIndex).c_str(), false, false ); VBankFileReader reader( fileNames.at( fileIndex ).c_str() ); - //reader.generateIndexAndChecksum(); int numPackets = reader.numPackets(); cout << "\t Packets: " << numPackets << endl; - for( int pack = 0; pack < numPackets; pack++ ) { packet = reader.readPacket( pack ); if( packet ) { - writePacket = true; - if( packet->hasArrayEvent() ) { arrayEvent = packet->getArrayEvent(); @@ -128,17 +121,15 @@ int main( int argc, char** argv ) } } } - if( packet->hasSimulationData() ) { sim = packet->getSimulationData(); if( sim ) { sim->fRunNumber = newRunNumber; - sim->fEventNumber = globalEventCount; + sim->fEventNumber = globalEventCount; } } - if( packet->hasSimulationHeader() ) { header = packet->getSimulationHeader(); @@ -146,55 +137,35 @@ int main( int argc, char** argv ) { header->fRunNumber = newRunNumber; } - if( wroteSimHeader ) { writePacket = false; } - wroteSimHeader = true; - } - if( writePacket ) { writer.writePacket( packet ); globalEventCount++; } - delete packet; } - } } catch( const std::exception& ex ) { cerr << "For file " << fileNames.at( fileIndex ) << endl; cout << ex.what() << endl; - // cerr <