patch for rogue-less builds of pftool

LDMX-Software · Mar 11, 2022 · bdb4a6c · bdb4a6c
1 parent 0b9d3e4
commit bdb4a6c
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/tool/pftool.cc b/tool/pftool.cc
@@ -117,19 +117,7 @@ int main(int argc, char* argv[]) {
   std::vector<std::string> hostnames;
   for (int i = 1 ; i < argc ; i++) {
     std::string arg(argv[i]);
-#ifdef PFTOOL_UHAL
-#ifdef PFTOOL_ROGUE
-    if (arg=="-u") {
-      isuhal  = true;
-      isrogue = false;
-    } 
-    else if (arg=="-r") {
-      isrogue = true;
-      isuhal  = false;
-    } 
-#endif
-#endif
-    else if (arg=="-s") {
+    if (arg=="-s") {
       if (i+1 == argc or argv[i+1][0] == '-') {
         std::cerr << "Argument " << arg << " requires a file after it." << std::endl;
         return 2;
@@ -151,7 +139,20 @@ int main(int argc, char* argv[]) {
         BaseMenu::add_to_command_queue(line);
       }
       sFile.close() ;
-    } else {
+    }
+#ifdef PFTOOL_UHAL
+#ifdef PFTOOL_ROGUE
+    else if (arg=="-u") {
+      isuhal  = true;
+      isrogue = false;
+    } 
+    else if (arg=="-r") {
+      isrogue = true;
+      isuhal  = false;
+    } 
+#endif
+#endif
+    else {
       // positional argument -> hostname
       hostnames.push_back( arg ) ;
     }