Commit 3bda21ad authored by Suvankar Roy Chowdhury's avatar Suvankar Roy Chowdhury
Browse files

removal of unwanted lines from git merge

parent 5691b829
......@@ -79,20 +79,12 @@ int main( int argc, char* argv[] )
cmd.defineOption( "swap", "Swap endianness in Data::set. Default = true (Ph2_ACF); should be false for GlibStreamer Data", ArgvParser::NoOptionAttribute /*| ArgvParser::OptionRequired*/ );
cmd.defineOptionAlternative( "swap", "s" );
<<<<<<< HEAD
//cmd.defineOption( "8cbc", "Use 8CBC system. Default = false", ArgvParser::NoOptionAttribute /*| ArgvParser::OptionRequired*/ );
=======
>>>>>>> beamtest
cmd.defineOption( "tree", "Create a ROOT tree also. Default = false", ArgvParser::NoOptionAttribute /*| ArgvParser::OptionRequired*/ );
cmd.defineOption( "cbcType", "Specify the CBC type(2,8 or 16).", ArgvParser::OptionRequiresValue /*| ArgvParser::OptionRequired*/ );
cmd.defineOptionAlternative( "cbcType", "c" );
<<<<<<< HEAD
std::map<std::string,pair<int, string>> cbcTypeEvtSizeMap;
=======
std::map<std::string,pair<int, std::string>> cbcTypeEvtSizeMap;
>>>>>>> beamtest
cbcTypeEvtSizeMap["2"] = std::make_pair( 4, XML_DESCRIPTION_FILE_2CBC );
cbcTypeEvtSizeMap["8"] = std::make_pair( 8, XML_DESCRIPTION_FILE_8CBC );
cbcTypeEvtSizeMap["16"] = std::make_pair( 16, XML_DESCRIPTION_FILE_16CBC );
......
Supports Markdown
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