diff --git a/src/DaqDaqBuffer.cpp b/src/DaqDaqBuffer.cpp
index 07306f4de45c69aff9e89788114cdb84c8c52664..70d55b7d40d437f17320ed9a030d32b1c53db674 100644
--- a/src/DaqDaqBuffer.cpp
+++ b/src/DaqDaqBuffer.cpp
@@ -223,17 +223,23 @@ int main(int argc, char* argv[]) {
   
   // BE
 
-  if(argc>2 && (argc%2)!=1) {
+  //if(argc>2 && (argc%2)!=1) {
+  if(argc==1) {
     std::cerr << "Usage: " << argv[0] << " --<parameter> <value>  or  <parameter number>" << std::endl;
     return 1;
   }
 
-  if(argc==2) {
+  int initial(1);
+  if((argc%2)==0) {
+    initial=2;
+    
     unsigned nArg(0);
     std::istringstream sArg(argv[1]);
     sArg >> nArg;
     //    nArg--;
 
+    std::cout << nArg << std::endl;
+    
     seconds=pow(10,(nArg%10));
     nArg/=10;
     l1AcceptRate=550+50*(nArg%10);
@@ -244,29 +250,27 @@ int main(int argc, char* argv[]) {
     hgcrocLimit=(nArg%10);
     nArg/=10;
     hgcrocTransmission=40+2*(nArg%10);
+  }
+  
+  for(int i(initial);i<argc;i+=2) {
+    std::string sarg1(argv[i]);
+    std::istringstream sarg2(argv[i+1]);
     
+    if(sarg1=="--printLevel") sarg2 >> printLevel;
+    if(sarg1=="--seed") sarg2 >> rSeed;
+    if(sarg1=="--seconds") sarg2 >> seconds;
+    if(sarg1=="--l1AcceptRate") sarg2 >> l1AcceptRate;
+    if(sarg1=="--l1AcceptRandom") sarg2 >> l1AcceptRandom;
     
-  } else {
-    for(int i(1);i<argc;i+=2) {
-      std::string sarg1(argv[i]);
-      std::istringstream sarg2(argv[i+1]);
-      
-      if(sarg1=="--printLevel") sarg2 >> printLevel;
-      if(sarg1=="--seed") sarg2 >> rSeed;
-      if(sarg1=="--seconds") sarg2 >> seconds;
-      if(sarg1=="--l1AcceptRate") sarg2 >> l1AcceptRate;
-      if(sarg1=="--l1AcceptRandom") sarg2 >> l1AcceptRandom;
-      
-      if(sarg1=="--hgcrocLimit") sarg2 >> hgcrocLimit;
-      if(sarg1=="--hgcrocTransmission") sarg2 >> hgcrocTransmission;
-      
-      if(sarg1=="--slinkFile") sarg2 >> slinkNumber[0];
-      if(sarg1=="--slinkNumber") sarg2 >> slinkNumber[0];
-      if(sarg1=="--block") sarg2 >> block;
-      if(sarg1=="--econRandom") sarg2 >> econRandom;
-      if(sarg1=="--econFormat") sarg2 >> econFormat;
-      //if(sarg1=="--econFlow") sarg2 >> econFlow;
-    }
+    if(sarg1=="--hgcrocLimit") sarg2 >> hgcrocLimit;
+    if(sarg1=="--hgcrocTransmission") sarg2 >> hgcrocTransmission;
+    
+    if(sarg1=="--slinkFile") sarg2 >> slinkNumber[0];
+    if(sarg1=="--slinkNumber") sarg2 >> slinkNumber[0];
+    if(sarg1=="--block") sarg2 >> block;
+    if(sarg1=="--econRandom") sarg2 >> econRandom;
+    if(sarg1=="--econFormat") sarg2 >> econFormat;
+    //if(sarg1=="--econFlow") sarg2 >> econFlow;
   }
   
   std::ostringstream sout;