Changeset 37824

Timestamp:

Jan 12, 2015, 12:31:43 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-pv3-20140717-merge

Files:

• Nebulous/bin/neb-rm (modified) (1 prop)
• extsrc/gpcsw/gpcsrc/fits/burntool (modified) (1 prop)
• extsrc/gpcsw/gpcsrc/fits/burntool/persistio.c (modified) (3 diffs)
• hardware/dotConsolerc (copied) (copied from trunk/hardware/dotConsolerc )
• ippMonitor/czartool/czartool/Plotter.pm (modified) (2 diffs, 1 prop)

branches/eam_branches/ipp-pv3-20140717-merge/extsrc/gpcsw/gpcsrc/fits/burntool/persistio.c

@@ -115 +115 @@
 #define DIFFERENT_STREAK 20     /* Proximity for union versus intersection */
 
+# define myMAXSIZE 20000
+
+
 /****************************************************************/
 /* persist_merge(): Disentangle overlapping persistence streaks */
@@ -123 +126 @@
    int lapmax;
    OBJBOX *box;
-   int xusage[MAXSIZE], yctr[MAXSIZE], boxid[MAXSIZE];
+   int xusage[myMAXSIZE], yctr[myMAXSIZE], boxid[myMAXSIZE];
    double zk, zj;
 
@@ -131 +134 @@
 
 /* Assess the clustering of all the streaks */
-   for(i=0; i<MAXSIZE; i++) xusage[i] = 0;
-   for(i=0; i<MAXSIZE; i++) boxid[i] = -1;
+   for(i=0; i<myMAXSIZE; i++) xusage[i] = 0;
+   for(i=0; i<myMAXSIZE; i++) boxid[i] = -1;
    for(k=0; k<nbox; k++) {
-      if(box[k].exfit >= MAXSIZE-1) continue;
+      if(box[k].exfit >= myMAXSIZE-1) continue;
       for(i=box[k].sxfit; i<=box[k].exfit; i++) xusage[i] += 1;
    }
 
 /* Identify clusters */
-   for(xs=0; xs<MAXSIZE-1; xs++) {
+   for(xs=0; xs<myMAXSIZE-1; xs++) {
       if(xusage[xs] == 0) continue;
-      for(xe=xs, lapmax=0; xe<MAXSIZE-1; xe++) {
+      for(xe=xs, lapmax=0; xe<myMAXSIZE-1; xe++) {
          if(xusage[xe+1] == 0) break;
          lapmax = MAX(lapmax, xusage[xe]);

branches/eam_branches/ipp-pv3-20140717-merge/ippMonitor/czartool/czartool/Plotter.pm

@@ -671 +671 @@
         "set ylabel \"Space (TB)\";" .
         "set xtic rotate by -90 scale 0;" .
+        "set yrange [:100];" .
         "plot '".$tmpFile->filename."' " .
         "using 2:xtic(1) t \"Used\" lt 7," .
@@ -715 +716 @@
         "set style data histograms;" .
         "set ylabel \"Space (TB)\";" .
+        "set yrange [:100];" .
         "set xtic rotate by -90 scale 0;" .
         "plot '".$tmpFile->filename."' " .