--- DarthVader/TrackerLevel2/src/TrkProcess.cpp	2014/02/27 11:24:43	1.16
+++ DarthVader/TrackerLevel2/src/TrkProcess.cpp	2014/06/04 07:57:04	1.17
@@ -17,6 +17,8 @@
     geth  = 0;
     get2  = 1;
     gete  = 1;
+    getn  = 1;
+    extAlgID = 202;
     standalone = false;
     frame2 = "root";
     frame1 = "root";
@@ -42,6 +44,8 @@
 
     nskip = 0;
 
+    watch = false;
+
 //     TrkParams::SetTrackingMode();
 //     TrkParams::SetPrecisionFactor(); 
 //     TrkParams::SetStepMin();   
@@ -65,6 +69,8 @@
     get2 = 1;
     geth = 0;
     gete = 1;
+    getn = 1;
+    extAlgID = 202;
     standalone = false;
     frame2 = "root";
     frame1 = "root";
@@ -98,6 +104,8 @@
 	
     nskip = 0;
 
+    watch = false;
+
 //     TrkParams::SetTrackingMode();
 //     TrkParams::SetPrecisionFactor(); 
 //     TrkParams::SetStepMin();   
@@ -144,48 +152,63 @@
 	    continue;
 	}  
 	// -----------------------------------------------------//    
-	if (!strcmp(vcustom[i], "--dontget2") ||!strcmp(vcustom[i], "--dontget-level2") ){
-	    get2 = 0;
-	    continue;
-	}  
+// 	if (!strcmp(vcustom[i], "--dontget2") ||!strcmp(vcustom[i], "--dontget-level2") ){
+// 	    get2 = 0;
+// 	    gete = 0;
+// 	    getn = 0;
+// 	    continue;
+// 	}  
 	// -----------------------------------------------------//    
 	if (!strcmp(vcustom[i], "--dontgete") ||!strcmp(vcustom[i], "--dontget-exttrack") ){
 	    gete = 0;
 	    continue;
 	}  
 	// -----------------------------------------------------//    
-	if (!strcmp(vcustom[i], "--standalone") || !strcmp(vcustom[i], "-s")){
-	    standalone = true;
-	    continue;
-	}  
-	// -----------------------------------------------------//    
-	if (!strcmp(vcustom[i], "-processFile1")){
+	if (!strcmp(vcustom[i], "-extalg")){
 	    if (++i >= ncustom) throw -3;
-	    get1 = 1;
-	    file1 = vcustom[i];
+	    gete = 1; 	    
+	    get2 = 1; 	    
+	    extAlgID = atoi(vcustom[i]);
 	    continue;
 	}  
 	// -----------------------------------------------------//    
-	if (!strcmp(vcustom[i], "-frame1")){
-	    if (++i >= ncustom)throw -3;
-	    get1 = 1;
-	    frame1 = vcustom[i];						
+	if (!strcmp(vcustom[i], "--dontgetn") ||!strcmp(vcustom[i], "--dontget-nuclei") ){
+	    getn = 0;
 	    continue;
 	}  
 	// -----------------------------------------------------//    
-	if (!strcmp(vcustom[i], "-frame2")){
-	    if (++i >= ncustom)throw -3;
-	    get2 = 1;
-	    frame2 = vcustom[i];
+	if (!strcmp(vcustom[i], "--standalone") || !strcmp(vcustom[i], "-s")){
+	    standalone = true;
 	    continue;
 	}  
 	// -----------------------------------------------------//    
-	if (!strcmp(vcustom[i], "-framee")){
-	    if (++i >= ncustom)throw -3;
-	    gete = 1;
-	    framee = vcustom[i];
+	if (!strcmp(vcustom[i], "-processFile1")){
+	    if (++i >= ncustom) throw -3;
+	    get1 = 1;
+	    file1 = vcustom[i];
 	    continue;
 	}  
+// 	// -----------------------------------------------------//    
+// 	if (!strcmp(vcustom[i], "-frame1")){
+// 	    if (++i >= ncustom)throw -3;
+// 	    get1 = 1;
+// 	    frame1 = vcustom[i];						
+// 	    continue;
+// 	}  
+// 	// -----------------------------------------------------//    
+// 	if (!strcmp(vcustom[i], "-frame2")){
+// 	    if (++i >= ncustom)throw -3;
+// 	    get2 = 1;
+// 	    frame2 = vcustom[i];
+// 	    continue;
+// 	}  
+// 	// -----------------------------------------------------//    
+// 	if (!strcmp(vcustom[i], "-framee")){
+// 	    if (++i >= ncustom)throw -3;
+// 	    gete = 1;
+// 	    framee = vcustom[i];
+// 	    continue;
+// 	}  
 	// -----------------------------------------------------//    
 	if (!strcmp(vcustom[i], "-pfa")){
 	    if (++i >= ncustom)throw -3;
@@ -222,6 +245,11 @@
 	    return 1;
 	}
 	// -----------------------------------------------------//    
+	if (!strcmp(vcustom[i], "--watch") ){
+	    watch = true;
+	    continue;
+	}
+	// -----------------------------------------------------//    
 	else if (!strcmp(vcustom[i], "--debug") || !strcmp(vcustom[i], "-d")){
 	    TrkParams::SetDebugMode();
 	    continue;
@@ -286,6 +314,9 @@
     cout << "   get level2       " << get2 << endl;
     cout << "   get hough        " << geth << endl;
     cout << "   get ext.tracking " << gete << endl;
+    if(gete)
+    cout << "   ext.tracking alg " << extAlgID << endl;
+    cout << "   get nuclei       " << getn << endl;
 //    cout << " frame1           " << frame1 << endl;
 //    cout << " frame2           " << frame2 << endl;
 //    cout << " frameh           " << frame2 << endl;
@@ -320,7 +351,9 @@
     printf( "\n --get1, --get-level1           : get LEVEL1 output (store only cluster associated to tracks) [default (no LEVEL1 output) ]  ");
     printf( "\n --get1-full, --get-level1-full : get LEVEL1 output (store all clusters)                      [default (no LEVEL1 output) ]  ");
     printf( "\n --dontget2, --dontget-level2   : do not get LEVEL2 output                                    [default (get LEVEL2 output)]");
-printf( "\n --dontgete, --dontget-exttrack     : do not get ext.tracking output                              [default (get LEVEL2 output)]");
+    printf( "\n --dontgete, --dontget-exttrack : do not get ext.tracking output                              [default (ext.algorythm 202)]");
+    printf( "\n --dontgetn, --dontget-nuclei   : do not get nuclei cleaned tracks                            [default (get nuclei output)]");
+    printf( "\n --extalg ID                    : apply ext.tracking algorythm n.ID                           [default (ID=202) ]  ");
     printf( "\n --geth,, --get-hough           : get Hough-transform output                                  [default (no Hough-t. output) ]  ");
     printf( "\n -pfa PFAID                     : type of output for LEVEL2, root/hbook                       [default 14 (COG4)  ] ");		
     printf( "\n -N PATH                        : load parameter of type N=1,2... from PATH                   [default (from DB)  ] ");