@@ -103,7 +103,7 @@ void uploadBadChannels(const char* ccdbUrl, long timestamp, const std::string pa
103103 if (timestamp == 1 && channels .empty ()) {
104104 // This is the default
105105 md ["default" ] = "true" ;
106- md ["Created" ] = "1"
106+ md ["Created" ] = "1" ;
107107 }
108108 std ::cout << "Storing MID problematic channels (valid from " << timestamp << ") to " << path << "\n" ;
109109
@@ -233,30 +233,68 @@ void ccdbUtils(const char* what, long timestamp = 0, const char* inFilename = "m
233233 timestamp = std ::chrono ::duration_cast < std ::chrono ::milliseconds > (std ::chrono ::system_clock ::now ().time_since_epoch ()).count ();
234234 }
235235
236- std ::vector < std ::string > whats = {"querybad" , "uploadbad" , "queryfake" , "uploadfake" , "querymasks" , "writemasks" , "uploadbadfrommasks" };
237-
238236 const std ::string fakeDeadChannelCCDBPath = "MID/Calib/FakeDeadChannels" ;
237+ const std ::string rejectListCCDBPath = "MID/Calib/RejectList" ;
239238
240- if (what == whats [0 ]) {
239+ std ::vector < std ::string > whats ;
240+ whats .emplace_back ("querybad" );
241+ if (what == whats .back ()) {
241242 queryBadChannels (ccdbUrl , timestamp , verbose , BadChannelCCDBPath );
242- } else if (what == whats [1 ]) {
243+ return ;
244+ }
245+
246+ whats .emplace_back ("uploadbad" );
247+ if (what == whats .back ()) {
243248 uploadBadChannels (ccdbUrl , timestamp , BadChannelCCDBPath );
244- } else if (what == whats [2 ]) {
249+ return ;
250+ }
251+
252+ whats .emplace_back ("queryrejectlist" );
253+ if (what == whats .back ()) {
254+ queryBadChannels (ccdbUrl , timestamp , verbose , rejectListCCDBPath );
255+ return ;
256+ }
257+
258+ whats .emplace_back ("uploadrejectlist" );
259+ if (what == whats .back ()) {
260+ uploadBadChannels (ccdbUrl , timestamp , rejectListCCDBPath );
261+ return ;
262+ }
263+
264+ whats .emplace_back ("queryfake" );
265+ if (what == whats .back ()) {
245266 queryBadChannels (ccdbUrl , timestamp , verbose , fakeDeadChannelCCDBPath );
246- } else if (what == whats [3 ]) {
267+ return ;
268+ }
269+
270+ whats .emplace_back ("uploadfake" );
271+ if (what == whats .back ()) {
247272 uploadBadChannels (ccdbUrl , timestamp , fakeDeadChannelCCDBPath );
248- } else if (what == whats [4 ]) {
273+ return ;
274+ }
275+
276+ whats .emplace_back ("querymasks" );
277+ if (what == whats .back ()) {
249278 queryDCSMasks (ccdbUrl , timestamp , verbose );
250- } else if (what == whats [5 ]) {
279+ return ;
280+ }
281+
282+ whats .emplace_back ("writemasks" );
283+ if (what == whats .back ()) {
251284 writeDCSMasks (ccdbUrl , timestamp );
252- } else if (what == whats [6 ]) {
285+ return ;
286+ }
287+
288+ whats .emplace_back ("uploadbadfrommasks" );
289+ if (what == whats .back ()) {
253290 uploadBadChannelsFromDCSMask (inFilename , timestamp , ccdbUrl , verbose );
254- } else {
255- std :: cout << "Unimplemented option chosen " << what << std :: endl ;
256- std :: cout << "Available:\n" ;
257- for (auto & str : whats ) {
258- std ::cout << str << " ";
259- }
260- std ::cout << std :: endl ;
291+ return ;
292+ }
293+
294+ std :: cout << "Unimplemented option chosen " << what << std :: endl ;
295+ std ::cout << "Available:\n " ;
296+ for ( auto & str : whats ) {
297+ std ::cout << str << " " ;
261298 }
299+ std ::cout << std ::endl ;
262300}
0 commit comments