From 2d9f96ce1b414f7188bf8443ee9787cde1ae3c81 Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <Shahzad.Malik.Muzaffar@cern.ch>
Date: Wed, 9 Jun 2021 17:13:00 +0200
Subject: [PATCH] revert format changes and add exceptions for selected
 sections

---
 Fireworks/Core/src/CmsShowMain.cc | 131 ++++++------------------------
 1 file changed, 23 insertions(+), 108 deletions(-)

diff --git a/Fireworks/Core/src/CmsShowMain.cc b/Fireworks/Core/src/CmsShowMain.cc
index a11ff3e4bb19c..916bbc3a9653f 100644
--- a/Fireworks/Core/src/CmsShowMain.cc
+++ b/Fireworks/Core/src/CmsShowMain.cc
@@ -159,121 +159,36 @@ CmsShowMain::CmsShowMain(int argc, char* argv[])
 
   namespace po = boost::program_options;
   po::options_description desc(descString);
+  // clang-format off
   desc.add_options()(kInputFilesCommandOpt, po::value<std::vector<std::string> >(), "Input root files")(
-      kConfigFileCommandOpt,
+      kConfigFileCommandOpt, po::value<std::string>(), "Include configuration file")(
+      kNoConfigFileCommandOpt, "Empty configuration")(kNoVersionCheck, "No file version check")(
+      kGeomFileCommandOpt, po::value<std::string>(), "Reco geometry file. Default is cmsGeom10.root")(
+      kSimGeomFileCommandOpt,
       po::value<std::string>(),
-      "Include configuration file")(kNoConfigFileCommandOpt,
-                                    "Empty configuration")(kNoVersionCheck,
-                                                           "No file version check")(kGeomFileCommandOpt,
-                                                                                    po::value<std::string>(),
-                                                                                    "Reco geometry file. Default is "
-                                                                                    "cmsGeom10."
-                                                                                    "root")(kSimGeomFileCommandOpt,
-                                                                                            po::value<std::string>(),
-                                                                                            "Geometry file for "
-                                                                                            "browsing in table view. "
-                                                                                            "Default is "
-                                                                                            "CmsSimGeom-14.root. Can "
-                                                                                            "be simulation or reco "
-                                                                                            "geometry in "
-                                                                                            "TGeo "
-                                                                                            "forma"
-                                                                                            "t")(kTGeoNameCommandOpt,
-                                                                                                 po::value<std::string>(),
-                                                                                                 "TGeoManager name. "
-                                                                                                 "The default is "
-                                                                                                 "\"cmsGeo;"
-                                                                                                 "1"
-                                                                                                 "\"")(kFieldCommandOpt,
-                                                                                                       po::value<
-                                                                                                           double>(),
-                                                                                                       "Set magnetic "
-                                                                                                       "field value "
-                                                                                                       "explicitly. "
-                                                                                                       "Default is "
-                                                                                                       "auto-field "
-                                                                                                       "estimatio"
-                                                                                                       "n")(kRootInteractiveCommandOpt,
-                                                                                                            "Enable "
-                                                                                                            "root "
-                                                                                                            "interactiv"
-                                                                                                            "e "
-                                                                                                            "promp"
-                                                                                                            "t")(kSoftCommandOpt,
-                                                                                                                 "Try "
-                                                                                                                 "to "
-                                                                                                                 "force"
-                                                                                                                 " soft"
-                                                                                                                 "ware "
-                                                                                                                 "rende"
-                                                                                                                 "ring "
-                                                                                                                 "to "
-                                                                                                                 "avoid"
-                                                                                                                 " prob"
-                                                                                                                 "lems "
-                                                                                                                 "with "
-                                                                                                                 "bad "
-                                                                                                                 "hardw"
-                                                                                                                 "are "
-                                                                                                                 "drive"
-                                                                                                                 "r"
-                                                                                                                 "s")(kExpertCommandOpt,
-                                                                                                                      "Enable PF user plugins.")(kHelpCommandOpt,
-                                                                                                                                                 "Display help message");
+      "Geometry file for browsing in table view. Default is CmsSimGeom-14.root. Can be simulation or reco geometry in "
+      "TGeo format")(kTGeoNameCommandOpt, po::value<std::string>(), "TGeoManager name. The default is \"cmsGeo;1\"")(
+      kFieldCommandOpt, po::value<double>(), "Set magnetic field value explicitly. Default is auto-field estimation")(
+      kRootInteractiveCommandOpt, "Enable root interactive prompt")(
+      kSoftCommandOpt, "Try to force software rendering to avoid problems with bad hardware drivers")(
+      kExpertCommandOpt, "Enable PF user plugins.")(kHelpCommandOpt, "Display help message");
 
   po::options_description livedesc("Live Event Display");
   livedesc.add_options()(
       kPlayCommandOpt, po::value<float>(), "Start in play mode with given interval between events in seconds")(
-      kPortCommandOpt,
+      kPortCommandOpt, po::value<unsigned int>(), "Listen to port for new data files to open")(
+      kLoopCommandOpt, "Loop events in play mode")(
+      kChainCommandOpt,
       po::value<unsigned int>(),
-      "Listen to port for new data files to open")(kLoopCommandOpt,
-                                                   "Loop events in play mode")(kChainCommandOpt,
-                                                                               po::value<unsigned int>(),
-                                                                               "Chain up to a given number of recently "
-                                                                               "open files. Default is 1 - no "
-                                                                               "chain")(kLiveCommandOpt,
-                                                                                        "Enforce playback mode if a "
-                                                                                        "user is not using "
-                                                                                        "display")(kAutoSaveAllViews,
-                                                                                                   po::value<
-                                                                                                       std::string>(),
-                                                                                                   "Auto-save all "
-                                                                                                   "views with given "
-                                                                                                   "prefix "
-                                                                                                   "(run_event_lumi_"
-                                                                                                   "view.<auto-save-"
-                                                                                                   "type> is "
-                                                                                                   "appended"
-                                                                                                   ")")(kAutoSaveType,
-                                                                                                        po::value<
-                                                                                                            std::string>(),
-                                                                                                        "Image type of "
-                                                                                                        "auto-saved "
-                                                                                                        "views, png or "
-                                                                                                        "jpg (png is "
-                                                                                                        "default"
-                                                                                                        ")")(kAutoSaveHeight,
-                                                                                                             po::value<
-                                                                                                                 int>(),
-                                                                                                             "Screensho"
-                                                                                                             "ts "
-                                                                                                             "height "
-                                                                                                             "when "
-                                                                                                             "auto-"
-                                                                                                             "save-all-"
-                                                                                                             "views is "
-                                                                                                             "enable"
-                                                                                                             "d")(kSyncAllViews,
-                                                                                                                  "Sync"
-                                                                                                                  "hron"
-                                                                                                                  "ize "
-                                                                                                                  "all "
-                                                                                                                  "view"
-                                                                                                                  "s "
-                                                                                                                  "on "
-                                                                                                                  "new "
-                                                                                                                  "even"
-                                                                                                                  "t");
+      "Chain up to a given number of recently open files. Default is 1 - no chain")(
+      kLiveCommandOpt, "Enforce playback mode if a user is not using display")(
+      kAutoSaveAllViews,
+      po::value<std::string>(),
+      "Auto-save all views with given prefix (run_event_lumi_view.<auto-save-type> is appended)")(
+      kAutoSaveType, po::value<std::string>(), "Image type of auto-saved views, png or jpg (png is default)")(
+      kAutoSaveHeight, po::value<int>(), "Screenshots height when auto-save-all-views is enabled")(
+      kSyncAllViews, "Synchronize all views on new event");
+  // clang-format on
 
   po::options_description debugdesc("Debug");
   debugdesc.add_options()(kLogLevelCommandOpt,