WebSVN – f9daq – Diff – /cvi/apps/sa02_daq/cvi/sa02_CVI.c

     if (sa02Verbose) {
       sa02Printf("Data in the file:%s\n", filename);
+    }
     if (gFp) {
       fp=gFp;
+    }
-    } else {
+    else {
       if (append) {
         fp=fopen(filename,"ab");
+      }
-      } else {
+      else {
         fp=fopen(filename,"wb");
+      }
+    }
     output=1;
     // run header
     runinfo.ch  = ch;
     runinfo.neve= toread;
     runinfo.writemode= towrite;
     sa02Printf("RUNINFO x0=%d nx=%d dx=%d\n", runinfo.x0,runinfo.dx,runinfo.nx);
     nbtotal+=fwrite(&runinfo, 1,sizeof(runinfo),fp); //gzip
+  }
-  } else {
+  else {
     if (sa02Verbose) {
       sa02Printf("Data are not written to the file!\n");
     }
   }
   if (!neve & (towrite || toread) ) {
     neve=1;
+  }
   int icfa_visible=0;
   int icfa_add=0;
   GetPanelAttribute (p6h, ATTR_VISIBLE, &icfa_visible);
   GetCtrlVal (p6h, MINIRICH_ADD, &icfa_add);
   if (icfa_visible) {
     icfa_Init();
     icfa_Histo();
   }
   ///////////////////////////////////////////////////////////////
   SetCtrlAttribute  (p1h, P1_GRAPH2D, ATTR_LABEL_TEXT , title);
   H2DInit(h2, "h2d",title, 144*4, 0,1,neve,data0, dstep);
   H2DSetTitleY(h2,scmd);
   sa02Printf("H2D nx=%d ny=%d  i=%d neve=%d\n", H2DGetNbinsX(h2),H2DGetNbinsY(h2), i, neve);
   plot2d(h2,1);
   for (i=0; i<neve; i++) {
     int nb = sizeof(uint32_t);
     int count=0;
     for (board=0; board<4; board++) {
       switch (towrite) {
         case 1: {
           rdata[count+2]= data;
           break;
+        }
+      }
       if (towrite==3) {
         SetCtrlVal(p1h,P1_SETVALUE, chip*36+ch );
+      }
-      } else {
+      else {
         SetCtrlVal(p1h,P1_SETVALUE, data);
       }
+    }
     Sa02SetNeve(toread);
     sa02Reset();
 //    for ( j=0; j< toread; j++)
+    {
       int eventerror =  0;
       if ( (count +2 +dsize)  >= maxsize) {
+      }
       do {
         if (sendswtrg == 1) Sa02SoftwareTrigger();
         nb  = sa02Read(mask, &rdata[count+2] );
+      }
-      } while  ( nb==0 && !ctrl_c);
+      while  ( nb==0 && !ctrl_c);
       if (nb==0)  sa02Printf("nb==0 LINE=%d\n",__LINE__);
       if (testfixeddata && nb>0) {
         int len = nb / sizeof(uint32_t);
         for (ir=0; ir<len; ir++) {
         readerror++;
         if (readerror==3) {
           ctrl_c = 1;
           system("date >> firmware.lock");
+        }
+      }
-      } else {
+      else {
         readerror= 0;
+      }
       for (ich=0; ich<144*4; ich++) {
         int xch = (143 - ich%144) + ich/144*144;
         H2DFillBin(h2, xch,i,rdata[count+2+ich]);
+      }
       if (icfa_visible) icfa_Event(&rdata[count+2], icfa_add );
       /*
       for (ich=0; ich<144; ich++) {
       //        id=(35-ich/4)+gBoardNumber*36;
       //        shft=(ich%4)*8;
         id=(17-ich/8)+sa02BoardNumber*18;
+        }
         if (sa02Verbose>2) {
           sa02Printf("%02X ",(rdata[count+2+id]>> shft)& 0xF );
       //        sa02Printf("%02X ",(rdata[count+2+id]>> shft)& 0xFF );
+        }
       }
       */
       if (sa02Verbose>2) sa02Printf("\n" );
       if (nb>=0) count+=module_header(0x3,&rdata[count],nb/sizeof(uint32_t));  // recid 0x3
         sa02Printf("%d events in %2.2f min (%d s)  TIMEOUTS=%d %s",ncount, (double)(t-tstart)/60.,t-tstart,  nerrors, ctime(&t));
+      }
       if (aborttimeout && (t-tstart)>aborttimeout) {
         sa02Printf("Abort timeout reached ....\n");
         ctrl_c=1;
         break;
       }
       told=t;
       if (nb==0) {
         nerrors++;
         //j--;    /// kako potem pride cez zeljeno stevil ozadetkov?
-      } else {
-        ncount++;
+      }
+      else {
+        ncount++;
+      }
     }
     if (externalcmd) {
       char ecmd[256];
       sprintf(ecmd,"%s %u %u %u %u",externalcommand,(unsigned int)  tstart,data, rdata[2], rdata[3]);
       if (sa02Verbose) {
         sa02Printf("Executing external command %s\n",ecmd);
+      }
       system(ecmd);
     }
     if (output && Random(0,1)<fraction) {
       evtrec.id = EVTREC_ID;
       evtrec.len=count*sizeof(uint32_t)+ sizeof(evtrec);
       evtrec.time= (uint32_t) time(NULL);
+      }
       if (nb!= (int) evtrec.len) {
         sa02Printf("Error writing! %d!=%d\n",nb,evtrec.len);
+      }
       nbtotal+= nb;
     }
     if (sa02Verbose==1)  {
       sa02Printf("[%d/%d] %u \t", i,count, (unsigned int) time(NULL));
       PrintData(rdata,count);
+    }
       ch += dstep;
       if (ch>35) {
         ch-=36;
         chip++;
+      }
+    }
-    } else {
+    else {
       data += dstep;
+    }
     if (ctrl_c ) {
       if (!testfixeddata) {
         sa02Printf("Ctrl+C Program interrupted ....\n");
+      }
       break;
+    }
+  }
   plot2d(h2, i-1);
   if (icfa_visible) icfa_Draw();
   if (output) {
     sprintf(scmd,"channel;daqtime=%f", Timer()-t0 );
     H2DSetTitleX(h2,scmd);
     H2DWrite2File(h2,fp);
     if (!gFp) {
       fclose(fp);
     }
+  }
   if (sa02Verbose>1) sa02Printf("%d bytes written to file %s\n", nbtotal, filename);
   time(&t);
   if (toread && !testfixeddata) sa02Printf("%d events in %2.2f min  (%f s)  TIMEOUTS=%d  %s",ncount, (double)(Timer()-t0)/60.,Timer()-t0, nerrors, ctime(&t));
   free(rdata);
   return 0;
 }
 int CVICALLBACK quit (int panel, int event, void *callbackData,
                       int eventData1, int eventData2) {
   switch (event) {
     case EVENT_CLOSE:
       // Stop timer callbacks
       quit(0,0,NULL,0,0);
       exit(0);
+  }
   return 0;
+}
 int SetParametersFromFile( const char *fname) {
   uint32_t gdata;
   uint32_t cdata;
   sa02AsicGlobalRegister  *greg = (sa02AsicGlobalRegister *) &gdata ;
     sa02Printf("Error! Cannot open file %s\n",fname);
     return -1;
+  }
   for (i=0; i<8*144*4; i++) {
     cregdata[i]=0;
   }
   for (i=0; i<7*4*4; i++) {
     gregdata[i]=0;
+  }
   gdata=0;
   cdata=0;
     if (strcmp(cmd,"MUXASIC")==0) {
       asic = sa02MuxMap(asic);
+    }
     switch (nb) {
       case 1: {
         if ( sa02code ) {
           SetCtrlVal(p3h,P3_FPGAPAR,line);
           break;
         }
         break;
+      }
       case 2: {
         if ( sa02code ) {
           SetCtrlVal(p3h,P3_FPGAPAR,line);
           break;
         }
         if (strcmp(cmd,"param_board")==0) {
           board= asic;
+        }
         if (strcmp(cmd,"load_global")==0) {
           row= asic+1;
           gregdata[(board*4+asic)*7+2] = greg->shapingtime;
           gregdata[(board*4+asic)*7+3] = greg->comparator;
           gregdata[(board*4+asic)*7+4] = greg->vrdrive;
           gregdata[(board*4+asic)*7+5] = greg->monitor;
           gregdata[(board*4+asic)*7+6] = greg->id;
           break;
         }
         break;
+      }
       case 3: {
         if ( sa02code) {
           SetCtrlVal(p3h,P3_FPGAPAR,line);
           greg->comparator = gval;
           break;
+        }
         if (strcmp(cmd,"vrdrive")==0)     {
           greg->vrdrive = gval;
           break;
         }
         if (strcmp(cmd,"monitor")==0)     {
           greg->monitor = gval;
           break;
+        }
         if (strcmp(cmd,"load_ch")==0)   {
           cdata=0;
           break;
+        }
         if (strcmp(cmd,"select")==0)    {
           sa02Printf ("%s not implemeted yet\n", cmd);
           break;
         }
         break;
+      }
       case 4: {
         if (strcmp(cmd,"param_ch")==0)    {
           cdata = 0;
           break;
         }
         if (strcmp(cmd,"decaytime")==0)  {
           creg->decaytime = cval;
           break;
+        }
         if (strcmp(cmd,"offset")==0)     {
           creg->offset = cval;
           break;
         }
         if (strcmp(cmd,"fineadj_unipol")==0) {
           creg->fineadj_unipol = cval;
           break;
+        }
         if (strcmp(cmd,"fineadj_diff")==0) {
           creg->fineadj_diff   = cval;
           break;
+        }
         if (strcmp(cmd,"tpenb")==0)      {
           creg->tpenb = cval;
           break;
+        }
     case MENU_OPERATIO_LASER:
       DisplayPanel(p5h);
       break;
     case MENU_MINIRICH:
       DisplayPanel(p6h);
       break;
     case MENU_OPERATIO_EXIT :
       quit(0,0,NULL,0,0);
       exit(0);
       //loop_on=0;
       break;
   told=t;
   for ( j=0; j< neve; j++) {
     do {
       if (sendswtrg==1) Sa02SoftwareTrigger();
       nb  = sa02Read(mask, data );
+    }
-    } while  ( nb==0 && !ctrl_c);
+    while  ( nb==0 && !ctrl_c);
     if (nb==0)  sa02Printf("nb==0 LINE=%d\n",__LINE__);
     if (ctrl_c==1) break;
     for (ch=0; ch<144*4; ch++) {
       GetCtrlVal(p1h,P1_PLOTEACHEVENT, &ploteachevent);
       SetCtrlVal(p1h,P1_CUREVE, j);
       ProcessSystemEvents ();
       ProcessSystemEvents ();
+    }
     told=t;
+  }
   plot2d(h2, nbit);
   SetCtrlVal(p1h,P1_CUREVE, j);
   return 0;
+}
 int CVICALLBACK LoadParameters (int panel, int control, int event,
                                 void *callbackData, int eventData1, int eventData2) {
   char fname[0xFF];
   uint16_t mask;
   switch (event) {
     case EVENT_COMMIT:
       mask=GetConnectedFebMask();
       sa02Printf("LoadParameters 0x%0x\n", mask);
       GetCtrlVal(p3h, P3_INPUTFILE, fname);
       GetCtrlVal(p1h,P1_BOARDTYPE,&sa02BoardType);
             SetCtrlVal(p1h,P1_SETSINGLEVALUE,k);
             SetCtrlVal(p1h,P1_CUREVE,k);
             retval=sa02Cmd(board, FEB_VTH1 , k  , chip, channel ,1, response);
             val=sa02Cmd(board, FEB_ADC_READ, data, chip, channel ,1,response);
             if (sa02BoardType>2)
-              doubleval = (2*((val & 0xFFF) + 0.5)/0x1000 - 1.) * 3.3;
+              doubleval = sa02adc2Vm(val);
             else
+              doubleval = sa02adc2V(val);
+//              doubleval = (2*((val & 0xFFF) + 0.5)/0x1000 - 1.) * 3.3;
+//           else
-              doubleval = ((val & 0xFFF) + 0.5)/0x1000 * 3.3;
+//              doubleval = ((val & 0xFFF) + 0.5)/0x1000 * 3.3;
             H1DFillBin(h1+board, k, doubleval);
             if (t!=told || k==kmax-1 ||k==0 ) {
               H1DDraw(h1+board,p1h, P1_GRAPH, &phandle[board]);
               sa02Printf("[%d] set VTH1=%d  ADC(VTH1)= %6.3f V\n",board, k,  doubleval);
               SetCtrlVal(p1h,P1_CUREVE, k);
+      }
+    }
     switch (cmd & (~ FEB_RO)) {
       case FEB_ADC_READ:
       case FEB_ADC_RESET:
+        doubleval = sa02adc2V(val);
-        doubleval = ((val & 0xFFF) + 0.5)/0x1000 * 3.3;
+//        doubleval = ((val & 0xFFF) + 0.5)/0x1000 * 3.3;
         sa02Printf("ADC %f, 0x%08x\n", doubleval, val ) ;
         break;
       case FEB_TMON1:
       case FEB_TMON0:
         doubleval = ( (val >>2 ) & 0xFFF ) * 0.0625;
         else
           val=0x30;
         val=sa02Cmd(board, FEB_MUX, val, 0, 0 ,1,response);
         val=sa02Cmd(board, FEB_ADC_READ, 0, 0, 0, 1,response);
         if (sa02BoardType>2)
+          doubleval = sa02adc2Vm(val);
-          doubleval = (2*((val & 0xFFF) + 0.5)/0x1000 - 1.) * 3.3;
+//          doubleval = (2*((val & 0xFFF) + 0.5)/0x1000 - 1.) * 3.3;
         else
+          doubleval = sa02adc2V(val);
-          doubleval = ((val & 0xFFF) + 0.5)/0x1000 * 3.3;
+//          doubleval = ((val & 0xFFF) + 0.5)/0x1000 * 3.3;
         sa02Printf("%5d %6.3f\n",data, doubleval);
         break;
       case SA0x_ASIC0_GREG:
         if (cmd & FEB_RO) {
           sa02PrintGREG(&val,"Returned GREG data->");
+        }
         break;
       case SA0x_ASIC0_CREG:
         if (cmd & FEB_RO) {
             id= P1_GRAPHY;
             sprintf(name,"Y");
             break;
+        }
         h2=0;
+      }
-      } else {
+      else {
         switch (control) {
           case P2_PRINTXY:
             id= P2_GRAPH_1;
             sprintf(name,"XY");
             break;
+        }
         h2=1;
       }
       GetSystemDate (&month,&day ,&year );
       GetSystemTime(&hours, &minutes, &seconds);
       if (id>=0) {
         if( ( (panel == p1h)&&(control ==  P1_PRINT2D) ) || ((panel == p2h)&&(control ==  P2_GRAPH_1))) {
           sprintf(dfile ,"data/%d_%d_%d_%d_%d_%s.th2d",year,month,day,hours,minutes, name );
           H2DWrite(h2,dfile,"wb");
           sa02Printf("sizeof H2D %d \n",sizeof(H2D));
           sa02Printf("H2D image saved as %s\n", dfile);
           sprintf(name ,"C:\\root\\bin\\root.exe ..\\macros\\H2Dload.cxx(\\\"%s\\\")", dfile);
           LaunchExecutable(name);
+        }
-        } else {
+        else {
           sprintf(dfile ,"data/%d_%d_%d_%d_%d_%s.bmp",year,month,day,hours,minutes, name );
           SaveCtrlDisplayToFile (panel,id, 0, -1, -1, dfile);
           sa02Printf("bmp image saved as %s\n", dfile);
+        }
+      }
         GetCtrlVal(panel,ctrlID, &ch);
         if (ch) {
           H3DDrawSliceXY(100+board,ch-1,panel,graph, plot);
+        }
-        } else {
+        else {
           H2DDraw(100+board,panel,graph, plot);
+        }
+      }
       break;
+  }
       monrec.status[ii] = buf[0];   //status
       monrec.vmon[ii] = buf[1]*1000;//zapisano v mV
       monrec.imon[ii] = buf[2]*1000;//zapisano v nA
       monrec.vset[ii] = buf[3]*1000;//zapisano v mV
       monrec.iset[ii] = buf[4]*1000;//zapisano v nA
+    }
-    } else {
+    else {
       buf[0]=(unsigned short) (channels[ii]<<8) | ReadStatus;
       if (gCAEN_V288) {
         V288_Send(0,SYS403mid,1,buf);
         retval=V288_Receive(0,255,buf);
+      }
           V288_Send(0,SYS403mid,1,buf);
           retval=V288_Receive(0,255,buf);
+        }
         vset[ii] = monrec.vset[ii] = buf[7]*10;//zapisano v mV
         iset[ii] = monrec.iset[ii] = buf[10]*10;//zapisano v nA
       }
       monrec.vset[ii] = vset[ii];//zapisano v mV
       monrec.iset[ii] = iset[ii];//zapisano v nA
+    }
     //sa02Printf("%04x \t %d \t %d \t %d \t %d *\n",monrec.status[ii],monrec.vmon[ii],monrec.vset[ii],monrec.imon[ii],monrec.iset[ii]);
+  }
   SetCtrlAttribute (p2h, P2_DAQ, ATTR_DIMMED, 1);
   ctrl_c=0;
   GetCtrlVal(p1h,P1_BOARDTYPE,&sa02BoardType);
   GetCtrlVal (p1h, P1_SERIAL_1, serial[0]);
   GetCtrlVal (p1h, P1_SERIAL_2, serial[1]);
   GetCtrlVal (p1h, P1_SERIAL_3, serial[2]);
   GetCtrlVal (p1h, P1_SERIAL_4, serial[3]);
   GetCtrlVal (p2h, P2_XC,  &x0);
   GetCtrlVal (p2h, P2_YC,  &y0);
   GetCtrlVal (p2h, P2_DIRECTION,  &runrec.direction);
   SetCtrlAttribute(p1h,P1_TRGHVMON,ATTR_ENABLED,1);
   hvmonFirst = 0;
   GetCtrlVal(p1h,P1_SENDSWTRIG,&sendswtrg);
     GetCtrlVal (p2h, P2_NEWF, &fmax);
     fmax*=1000000;//fmax in Mega Bytes
+  }
   time (&t0);
   sa02Printf("---->daq_scan\n");
   if (dsave) {
     sprintf(dfile,"%s_file%02d.dat",dfile0,fcount);
     //gFp = fopen (dfile, "ab");
     gFp = fopen (dfile, "ab");
     if (gFp==NULL) sa02Printf("----> !!! gFp==NULL !!!\n");
     if (ferror (gFp)) sa02Printf("----> !!! ferror (gFp) after fopen !!!\n");
     //time ((time_t *) &runrec.time);
     time (&cas);
     runrec.time = (uint32_t) cas;
     status = (int) fwrite (&runrec, 1, runrec.len, gFp);
     if(status != runrec.len) sa02Printf("----> !!! status != runrec.len (= %d) !!!\n", status);
     if (ferror (gFp)) sa02Printf("----> !!! ferror (gFp) = %d !!!\n", ferror (gFp));
+  }
   for (i=0; i<4; i++) {
     sprintf(title,"HAPD%d Surface Scan single channels", i);
     sprintf(hname,"hxy%d_sum", i);
     H2DInit(hxy+i,hname,runrec.serial, runrec.nx,runrec.x0, runrec.dx,runrec.ny,runrec.y0, runrec.dy);
     if (scanunitsx) {
       H2DSetTitleX(hxy+i,"x (channels)");
       H3DSetTitleX(hxy+i,"x (channels)");
+    }
-    } else {
+    else {
       H2DSetTitleX(hxy+i,"x (stage steps)");
       H3DSetTitleX(hxy+i,"x (stage steps)");
+    }
     if (scanunitsy) {
       H2DSetTitleY(hxy+i,"y (channels)");
       H3DSetTitleY(hxy+i,"y (channels)");
+    }
-    } else {
+    else {
       H2DSetTitleY(hxy+i,"y (stage steps)");
       H3DSetTitleY(hxy+i,"y (stage steps)");
     }
   }
   if (runrec.direction) {
     ny = runrec.ny;
     nx = runrec.nx;
+  }
-  } else {
+  else {
     ny = runrec.nx;
     nx = runrec.ny;
+  }
   rdata = malloc(sizeof(uint32_t)*maxsize);
       posrec.iy = iy;
       posrec.yset=runrec.y0+posrec.iy*runrec.dy;
       if (scanunitsy) {
         if (posrec.yset>5) {
           addgap=gapy * fx;
+        }
-        } else {
+        else {
           addgap=0;
+        }
         posrec.yset = (int32_t)(y0+dy *fx * posrec.yset + addgap);
+      }
       if (gMIKRO_Y) {
         sa02Printf("->MIKRO_MoveTo (2, y);%d\n",posrec.yset);
+      }
       SetCtrlVal (p2h, P2_Y, posrec.yset);
       SetCtrlVal (p2h, P2_IY, posrec.iy);
+    }
-    } else {
+    else {
       posrec.ix = iy;
       posrec.xset=runrec.x0+posrec.ix*runrec.dx;
       if (scanunitsx) {
         if (posrec.xset>5) {
           addgap=gapx * fx;
+        }
-        } else {
+        else {
           addgap=0;
+        }
         posrec.xset =  (int32_t)(x0+dx *fx * posrec.xset + addgap);
+      }
       if (gMIKRO_Y) {
         posrec.ix = ix;
         posrec.xset=runrec.x0+posrec.ix*runrec.dx;
         if (scanunitsx) {
           if (posrec.xset>5) {
             addgap=gapx * fx;
+          }
-          } else {
+          else {
             addgap=0;
+          }
           posrec.xset =  (int32_t)(x0+dx *fx * posrec.xset + addgap);
+        }
         if (gMIKRO_X) {
           //sa02Printf("MIKRO_MoveTo (1, x);%d\n",posrec.x);
           MIKRO_MoveTo (MIKRO_X, posrec.xset);
           sa02Printf("->MIKRO_MoveTo (1, x);%d\n",posrec.xset);
+        }
         SetCtrlVal (p2h, P2_X, posrec.xset);
         SetCtrlVal (p2h, P2_IX, posrec.ix);
+      }
-      } else {
+      else {
         posrec.iy = ix;
         posrec.yset=runrec.y0+posrec.iy*runrec.dy;
         if (scanunitsy) {
           if (posrec.yset>5) {
             addgap=gapy * fx;
+          }
-          } else {
+          else {
             addgap=0;
+          }
           posrec.yset =  (int32_t)(y0+dy *fx * posrec.yset + addgap);
+        }
         if (gMIKRO_X) {
         if (fmax && (ftell(gFp) > fmax)) {
           fcount+=1;
           sprintf(dfile,"%s_file%02d.dat",dfile0,fcount);
           fclose(gFp);
           gFp = fopen (dfile, "ab");
         }
         time (&cas);
         posrec.time = (uint32_t) cas;
         status = (int) fwrite (&posrec, 1, posrec.len, gFp);
+      }
       for (board=0; board<4; board++) {
         if (mask & (1<<board)) {
           sa02Cmd( board, FEB_VTH1, runrec.ped, 0,0,1,response);
           Sa02TestPulseEnable(board,tpenb); // Enable/disable test pulse
         }
       }
       Sa02SetNeve(runrec.nev);
       evtrec.nev=1;
       sa02Reset();
       if (ctrl_c) break;
       if ( (count+2+dsize)  >= maxsize) {
         maxsize*=2;
         sa02Printf("Increasing data buffer to %d elements\n", maxsize);
         rdata=realloc(rdata ,sizeof(uint32_t)*maxsize);
       }
       data = &rdata[count+2];
       do {
         //int k;
         //uint32_t inputtriggers;
         /*
         for (k=0; k<4; k++)  c[k] = Sa02GetCounter ( k ,&e[k]);
         for (k=0; k<4; k++)  sa02Printf(" CNTR%d=%d (ERR=%d)\t",k,c[k],e[k]);
         sa02Printf("\nsa02Read bytes =  %d mask=%d neve=%d (%d # %d)\n", nb, mask, runrec.nev, Sa02GetNeve( &inputtriggers ) , inputtriggers);
         */
+      }
-      } while  ( nb==0 && !ctrl_c);
+      while  ( nb==0 && !ctrl_c);
       if (sa02TimerOut || nb==0) sa02Printf("sa02TimerOut || nb==0\n");
       for (ich=0; ich<144*4; ich++) {
         int brd = ich/144;
         int xch   = 143 - ich%144;
+        }
+      }
       sa02Printf("max couts = %d %d %d %d\n", xyval[0],xyval[1],xyval[2],xyval[3]);
       if (nb>=0) {
         count+=module_header(0x3,&rdata[count],nb/sizeof(uint32_t));
       }
       /*
       for (ich=0; ich<144; ich++) {
       //          uint32_t mask=0xFF;
             id=(17-ich/8)+board*18;
         shft=(ich%8)*4;
         if ( data[id]  & (mask <<shft)  )  {
           H3DFillBin(hxy, posrec.ix,posrec.iy,ich,1);
           H2DFillBin(hxy, posrec.ix,posrec.iy,1);
         }
+      }
       */
       if (dsave) {
         if (Random(0,1)<fraction) {
           writeevents=1;
+        }
-        } else {
+        else {
           writeevents=0;
+        }
         if (writeevents) {
           evtrec.id = EVTREC_ID;
           evtrec.len=count*sizeof(uint32_t)+ sizeof(evtrec);
         EstimatedFinish(p2h, P2_PROGRESS, P2_ETA, t0, done);
         GetCtrlVal(p2h,P2_CH, &ch);
         for (board=0; board<4; board++) {
           if (ch) {
             H3DDrawSliceXY(hxy+board,ch,p2h, p2graph[board], &p2plothandle[board]);
+          }
-          } else {
+          else {
             H2DDraw(hxy+board,p2h, p2graph[board], &p2plothandle[board]);
+          }
+        }
         ProcessSystemEvents ();
         SetCtrlVal(p2h,P2_CEVE, i);
         sa02Printf("%d events in %2.2f min (%d s) %s",ncount, (double)(t-tstart)/60.,t-tstart, ctime(&t));
+      }
       told=t;
       monrec.status[i] = buf[0];   //status
       monrec.vmon[i] = buf[1]*1000;//zapisano v mV
       monrec.imon[i] = buf[2]*1000;//zapisano v nA
       monrec.vset[i] = buf[3]*1000;//zapisano v mV
       monrec.iset[i] = buf[4]*1000;//zapisano v nA
+    }
-    } else {
+    else {
       buf[0]=(unsigned short) (channels[i]<<8) | ReadStatus;
       if (gCAEN_V288) {
         V288_Send(0,SYS403mid,1,buf);
         odg=V288_Receive(0,255,buf);
       }
       monrec.vmon[i] = buf[1]*10;//zapisano v mV
       monrec.imon[i] = buf[2]*10;//zapisano v nA
       monrec.status[i] = buf[3]; //status
       if(!hvmonFirst) {
         buf[0]=(unsigned short) (channels[i]<<8) | ReadParameters;
+    }
     sa02Printf("%04x \t %.02f V \t %d V \t\t %.02f muA \t %d muA *\n",monrec.status[i],(float)monrec.vmon[i]/1000,monrec.vset[i]/1000,(float)monrec.imon[i]/1000,monrec.iset[i]/1000);
+  }
   time (&t1);
   sa02Printf("Cas izvedbe:%g s.\n",difftime(t1,t0));
   return 0;
+}
 int CVICALLBACK set_dac(int OnOff) {
   int val;
   char name[MAX_PATHNAME_LEN];
   if (OnOff) {
     GetCtrlVal (p5h, P5_DAC_ON, &val);
     sprintf(name ,"%s -p %d",palaser, val);
     sa02Printf("%s\n", name);
     system(name);
     GetCtrlVal (p5h, P5_FREQUENCY_ON, &val);
     sprintf(name ,"%s -f %d",palaser, val);
     sa02Printf("%s\n", name);
     system(name);
+  }
-  } else {
+  else {
     GetCtrlVal (p5h, P5_DAC_OFF, &val);
     sprintf(name ,"%s -p %d",palaser, val);
     sa02Printf("%s\n", name);
     system(name);
     GetCtrlVal (p5h, P5_FREQUENCY_OFF, &val);
     if((buf[0]&0x20)&&(buf[0]&0x20)) sa02Printf("Channel is ramping up \t Vmon: %d V \t Vset: %d \t status: 0x%x\n",buf[1],buf[3],buf[0]);
     else if(buf[0]&0x40) sa02Printf("Channel is ramping down \t Vmon: %d V \t Vset: %d \t status: 0x%x\n",buf[1],buf[3],buf[0]);
     else if(buf[0]&0x1E) {
       sa02Printf("status: 0x%x\n",buf[0]);
       return -1;
+    }
-    } else  sa02Printf("status: 0x%x\n",buf[0]);
+    else  sa02Printf("status: 0x%x\n",buf[0]);
     Delay(2);
     buf[0]=(unsigned short) (channel<<8) | ReadOperationalParam;
     V288_Send(0,N470mid,1,buf);
     ret=V288_Receive(0,255,buf);
+  }
   LoadParameters(p3h, P3_LOADPAR, EVENT_COMMIT, NULL, 0, 0);    // load parameters from defaul.param to FEB
   ProcessSystemEvents ();
   LoadParameters(p3h, P3_LOADPAR, EVENT_COMMIT, NULL, 0, 0);    // load parameters from defaul.param to FEB
   ProcessSystemEvents ();
   LoadParameters(p3h, P3_LOADPAR, EVENT_COMMIT, NULL, 0, 0);    // load parameters from defaul.param to FEB
   ProcessSystemEvents ();
   /****** MicroMini calibration ******/
   sa02Printf("Calibration *\n\n");
   SetHome(p2h, P2_HO,EVENT_COMMIT,NULL, 0, 0);
   SetCtrlVal(p2h,P2_XC,gCENTER_X);
   SetCtrlVal(p2h,P2_YC,gCENTER_Y);
   /****** Reads run number ******/
   fp = fopen ("CompleteScan_RunNumber.txt","r");
   if (fp) {
     if (fgets(line,ndim,fp)!= NULL) current_run = atoi(line)+1;
     fclose(fp);
     fp = NULL;
+  }
   ProcessSystemEvents ();
   /****** Slow Control ******/
   sprintf(line,"%04d_SlowControl.xml",current_run);
   daq_scan(NULL);
   sprintf(cmdCommand,"cmd.exe /c mkdir ..\\modules\\%04d & ..\\sa02read -i %s_file01.dat -o ..\\modules\\%04d\\%s.root",
           current_run, line, current_run, buf);
   LaunchExecutable(cmdCommand);
   /****** 2D v X ******/
   // Panel 2 settings
   SetCtrlVal (p2h, P2_SCANUNITSX, 0);   // Continuous scan over X  (1 Ch, 0 Step)
   SetCtrlVal (p2h, P2_NX, 380/2);         // Noumber of steps = 380
   SetCtrlVal (p2h, P2_XSTEP, 2*500);      // Step size = 500
   SetCtrlVal (p2h, P2_SCANUNITSY, 1);   // Only over the channel centers   (1 Ch, 0 Step)
   SetCtrlVal (p2h, P2_NY, 12);          // Noumber of steps = 12
   SetCtrlVal (p2h, P2_YSTEP, 1);        // Step size = 1
   SetCtrlVal (p2h, P2_YMIN, 0);         // Start position = 0
   SetCtrlVal (p2h, P2_DIRECTION, 1);    // Set Y then scan X = 1
   SetCtrlVal (p2h, P2_NEVE, 1000);       // Number of events for position scan
   SetCtrlVal (p2h, P2_PEDESTAL, ithr);   // Treshold
   SetCtrlVal (p2h, P2_DAQEXE, 0);       // Execute at each position: nothing
   sprintf(buf,"%04d_2_2DX",current_run);
   sprintf(line,"..\\modules\\%s", buf);
   SetCtrlVal (p2h, P2_DFILE, line);
   daq_scan(NULL);
   SetCtrlVal (p2h, P2_SCANUNITSY, 0);   // Continuous scan over Y  (1 Ch, 0 Step)
   SetCtrlVal (p2h, P2_NY, 380/2);          // Noumber of steps = 380
   SetCtrlVal (p2h, P2_YSTEP, 2*500);        // Step size = 500
   SetCtrlVal (p2h, P2_YMIN, 75000);         // Start position = 7500
   SetCtrlVal (p2h, P2_DIRECTION, 0);    // Set X then scan Y = 0
   SetCtrlVal (p2h, P2_NEVE, 1000);        // Number of events for position scan
   SetCtrlVal (p2h, P2_PEDESTAL, ithr);   // Treshold
   SetCtrlVal (p2h, P2_DAQEXE, 0);       // Execute at each position: nothing
   daq_scan(NULL);
   sprintf(cmdCommand,"cmd.exe /c mkdir ..\\modules\\%04d & ..\\sa02read -i %s_file01.dat -o ..\\modules\\%04d\\%s.root ", current_run, line, current_run, buf);
   system(cmdCommand); // wait here to finish to proceed to next step
   sprintf(cmdCommand,"cmd.exe /c ..\\thisroot.bat & cd analysis & root script.c(%d)",current_run);
   LaunchExecutable(cmdCommand);
   SetCtrlVal (p2h, P2_ZSET, 300000);
   SetCtrlVal (p2h, P2_XC, (uint32_t)(gCENTER_KX*0+gCENTER_X));
       strcpy(gUirCtrlMap[gNUirCtrlMap].name, ctrl );
       if (gNUirCtrlMap<MAX_UIRCTRLMAP_SIZE) {
         gUirCtrlMap[gNUirCtrlMap].id     = ctrlid;
         gUirCtrlMap[gNUirCtrlMap].handle = GetPanelHandle(ctrl);
         gNUirCtrlMap++;
+      }
-      } else {
+      else {
         sa02Printf("ERROR: Increase gNUirCtrlMap\n");
+      }
+    }
+  }
   fclose(fp);
       cache_sz_inc *= cache_sz_inc_factor;
       if (cache_sz_inc > cache_sz_inc_max) {
         cache_sz_inc = cache_sz_inc_max;
+      }
+    }
     pos_cache[count-1] = pstr2 - str;
     pstr = pstr2 + oldlen;
+  }
   orglen = pstr - str + strlen(pstr);
   /* Allocate memory for the post-replacement string. */
   if (count > 0) {
     newlen = strlen(new);
     retlen = orglen + (newlen - oldlen) * count;
+  }
-  } else  retlen = orglen;
+  else  retlen = orglen;
   ret = malloc(retlen + 1);
   if (ret == NULL) {
     goto end_repl_str;
   }
   if (count == 0) {
     /* If no matches, then just duplicate the string. */
     strcpy(ret, str);
+  }
-  } else {
+  else {
     /* Otherwise, duplicate the string whilst performing
      * the replacements using the position cache. */
     pret = ret;
     memcpy(pret, str, pos_cache[0]);
     pret += pos_cache[0];
 int CVICALLBACK run_script(void *functionData) {
   FILE *fp = NULL;
   FILE *fpout =NULL;
   char *line;
   char buf[MAX_PATHNAME_LEN];
   int status;
   char type[MAX_PATHNAME_LEN];
   char param[MAX_PATHNAME_LEN];
   if (!fp) {
     sa02Printf("Error! Cannot open script file %s\n",scriptname);
     return -1;
+  }
   while (fgets(buf,MAX_PATHNAME_LEN,fp)!=NULL ) {
     if (buf[0]!='#' && strlen(buf)>2) {
       if (strstr(buf, "%RUN%")!=NULL) {
-          char srun[16];
+        char srun[16];
-          sprintf(srun,"%04d",runno);
+        sprintf(srun,"%04d",runno);
-          line = str_replace(buf,"%RUN%", srun);
+        line = str_replace(buf,"%RUN%", srun);
-      } else {
-          line = buf;
+      }
+      else {
+        line = buf;
+      }
       sa02Printf("#[%d] %s",strlen(buf),buf);
       sscanf(line,"%s",type);
       if (strstr(type,"SetCtrlVal")!=NULL) {
         int pID;
         int rID;
         int datatype;
         sscanf(line,"%*s%s%s",param,paramValue);
         pID= GetPanelHandle(param);
         rID= GetControlID(param);
         if (rID>0 && pID>0) {
           GetCtrlAttribute (pID, rID, ATTR_DATA_TYPE, &datatype);
-          switch (datatype){
+          switch (datatype) {
+            case VAL_INTEGER:
-            case VAL_INTEGER: SetCtrlVal (pID, rID, atoi(paramValue)); break;
+              SetCtrlVal (pID, rID, atoi(paramValue));
+              break;
+            case VAL_UNSIGNED_INTEGER:
-            case VAL_UNSIGNED_INTEGER: SetCtrlVal (pID, rID, strtoul(paramValue,NULL,0)); break;
+              SetCtrlVal (pID, rID, strtoul(paramValue,NULL,0));
+              break;
+            case VAL_SHORT_INTEGER:
-            case VAL_SHORT_INTEGER: SetCtrlVal (pID, rID, atoi(paramValue)); break;
+              SetCtrlVal (pID, rID, atoi(paramValue));
+              break;
+            case VAL_UNSIGNED_SHORT_INTEGER:
-            case VAL_UNSIGNED_SHORT_INTEGER: SetCtrlVal (pID, rID, strtoul(paramValue,NULL,0)); break;
+              SetCtrlVal (pID, rID, strtoul(paramValue,NULL,0));
+              break;
+            case VAL_DOUBLE :
-            case VAL_DOUBLE : SetCtrlVal (pID, rID, atof(paramValue)); break;
+              SetCtrlVal (pID, rID, atof(paramValue));
+              break;
+            case VAL_STRING :
-            case VAL_STRING : SetCtrlVal (pID, rID, paramValue      ); break;
+              SetCtrlVal (pID, rID, paramValue      );
+              break;
+            default:
-            default: sa02Printf("[%s] ATTR_DATA_TYPE of the %s not supported datatype %d p4h=%d\n\n", type, param, datatype, p4h);
+              sa02Printf("[%s] ATTR_DATA_TYPE of the %s not supported datatype %d p4h=%d\n\n", type, param, datatype, p4h);
+          }
           //sa02Printf("[%s] SetCtrlVal %s %s panel=%d control=%d\n",type,param, paramValue,pID,rID);
+        }
-        } else {
+        else {
-           sa02Printf("[%s] Invalid Ctrl %s %s panel=%d control=%d\n",type,param, paramValue,pID,rID);
+          sa02Printf("[%s] Invalid Ctrl %s %s panel=%d control=%d\n",type,param, paramValue,pID,rID);
         }
+      }
-      } else if (strstr(type,"2D")!=NULL) {
+      else if (strstr(type,"2D")!=NULL) {
         sscanf(line,"%*s%d%d%d%d%d%d%d%d%d%d%d%s",&scx,&nx,&xstep,&xmin,&scy,&ny,&ystep,&ymin,&direction,&nevents,&tresh,outputFileSuffix);
         sprintf(test,"%d %d %d %d %d %d %d %d %d %d %d %s *\n",scx,nx,xstep,xmin,scy,ny,ystep,ymin,direction,nevents,tresh,outputFileSuffix);
         sa02Printf("%s *\n\n",test);
         SetCtrlVal (p2h, P2_SCANUNITSX, scx);
         SetCtrlVal (p2h, P2_NX, nx);
         SetCtrlVal (p2h, P2_DFILE, outputFile);
         daq_scan(NULL);
+      }
-      } else if (strstr(type,"Delay")!=NULL) {
+      else if (strstr(type,"Delay")!=NULL) {
         int idelay=0;
         sscanf(line,"%*s%s",paramValue);
         for (idelay=atoi(paramValue) ; idelay>0; idelay--) {
           Delay(1);
           SetCtrlVal(p1h, P1_DELAY, idelay);
           ProcessSystemEvents();
           if (ctrl_c) break;
+        }
+      }
-      }  else if (strstr(type,"ThresholdLinearity")!=NULL) {
+      else if (strstr(type,"ThresholdLinearity")!=NULL) {
         char *fname;
         uint16_t mask = GetConnectedFebMask();
         sscanf(line,"%*s%s",paramValue);
         fname = paramValue;
         ThresholdLinearityCB (p1h, P1_THRVSADC, EVENT_COMMIT, NULL, 0, 0 );
         fpout = fopen(fname,"ab");
         if(fpout) {
           for (int board=0; board<4; board++) if ( mask &(1<<board))  H1DWrite2File(board,fpout);
           fclose(fpout);
+        }
+      }
-      }  else if (strstr(type,"LaunchExecutable")!=NULL) {
+      else if (strstr(type,"LaunchExecutable")!=NULL) {
         int index = FindPattern (line, 0, -1, "LaunchExecutable", 0, 0) + 17;
         char *cmd = &line[index];
         sa02Printf("cmd %d=%s\n",index, cmd);
         if (strlen(cmd)>0) LaunchExecutable( cmd );
+      }
-      }  else if (strstr(type,"CAEN_V729")!=NULL) {
+      else if (strstr(type,"CAEN_V729")!=NULL) {
         char *fname;
         //FILE *fpmon=NULL;
         sscanf(line,"%*s%s",paramValue);
         fname=paramValue;
         fpout = fopen(fname,"ab");
         if (fpout) {
           V729_SetFilePointer(fpout);
           V729_daq(NULL);
           fclose(fpout);
+        }
+      }
-      } else if (strstr(type,"HvMonitor")!=NULL) {
+      else if (strstr(type,"HvMonitor")!=NULL) {
         int nrepetitions;
         int delaytime;
         int k=0;
         FILE *fpmon=NULL;
         sscanf(line,"%*s%s%d%d",paramValue, &delaytime, &nrepetitions );
         fpmon = fopen(paramValue,"ab");
         if ( fpmon ) {
           hvmonFirst = 0;
           for (k=0; k<nrepetitions; k++) {
             double thv0,thv1;
             thv0 = Timer();
             GetHvMonitor();
-            for (int board=0;board<4;board++){
+            for (int board=0; board<4; board++) {
               double sdata[12];
-              for (int k=0;k<6;k++){
+              for (int k=0; k<6; k++) {
-                 sdata[k] = monrec.imon[k+4*board];
+                sdata[k] = monrec.imon[k+4*board];
-                 sdata[k+6] = 0;
+                sdata[k+6] = 0;
+              }
               SetAxisScalingMode (p1h, chart_control[board], VAL_LEFT_YAXIS, VAL_AUTOSCALE, 0, 1);
               SetAxisScalingMode (p1h, chart_control[board], VAL_RIGHT_YAXIS, VAL_AUTOSCALE, 0, 1);
               PlotStripChart (p1h, chart_control[board], sdata, 12, 0, 0, VAL_DOUBLE);
             }
             monrec.id = MONREC_ID;
             monrec.len = sizeof(monrec);
             thv1=Timer();
             status = (int) fwrite( &monrec,  1,  sizeof(monrec),fpmon);
             sa02Printf("[%04d] HvMonitor dt= %f s status=%d\n", runno, thv1-thv0, status );
             for (int idelay=delaytime ; idelay>0; idelay--) {
               Delay(1);
               SetCtrlVal(p1h, P1_DELAY, idelay);
               ProcessSystemEvents();
               if (ctrl_c) break;
+            }
             if (ctrl_c) break;
+          }
           fclose(fpmon);
+        }
-        } else {
+        else {
           sa02Printf("%s cannot open file %s\n",param, paramValue );
+        }
+      }
-      } else if (strstr(type,"GetRunNumberFromFile")!=NULL) {
+      else if (strstr(type,"GetRunNumberFromFile")!=NULL) {
         sscanf(line,"%*s%s",paramValue);
         runno = GetRunNumberFromFile(paramValue);
         SetCtrlVal(p1h, P1_RUNNO, runno);
         sa02Printf("%s %s run=>%d\n",type, paramValue, runno );
+      }
-      } else if (strstr(type,"IncreaseNumberInFile")!=NULL) {
+      else if (strstr(type,"IncreaseNumberInFile")!=NULL) {
         sscanf(line,"%*s%s",paramValue);
         runno = IncreaseRunNumberInFile(paramValue);
         sa02Printf("%s %s run=>%d\n",type, paramValue, runno );
         SetCtrlVal(p1h, P1_RUNNO, runno);
+      }
-      } else if (strstr(type,"LoadParameters")!=NULL) {
+      else if (strstr(type,"LoadParameters")!=NULL) {
         LoadParameters(p3h, P3_LOADPAR,EVENT_COMMIT,NULL,0,0);
         sa02Printf("Loading parameters *\n\n");
+      }
-      } else if (strstr(type,"QueueUserEvent")!=NULL || strstr(type,"ProcessUserEvent")!=NULL) {
+      else if (strstr(type,"QueueUserEvent")!=NULL || strstr(type,"ProcessUserEvent")!=NULL) {
         char scontrol[0xFF];
         int panelHandle=0;
         int controlID;
         sscanf(line,"%*s%s",scontrol);
         panelHandle = GetPanelHandle(scontrol);
         controlID   = GetControlID(scontrol);
         sa02Printf("UserEvent %s panelHandle %d controlID %d\n",scontrol, panelHandle, controlID );
         if (panelHandle>=0 && controlID >=0 ) {
           if (strstr(type,"ProcessUserEvent")!=NULL) {
             ProcessUserEvent(panelHandle, controlID,0);
+          }
-          } else {
+          else {
             data[1] = controlID;
             data[0] = panelHandle;
             status = CmtWriteTSQData (pTSQ, data, 1, TSQ_INFINITE_TIMEOUT, NULL);
           }
+        }
+      }
-      }  else if (strstr(type,"SetPositionAndMux")!=NULL) {
+      else if (strstr(type,"SetPositionAndMux")!=NULL) {
         int ix,iy;
         sscanf(line,"%*s%d%d",&ix,&iy);
         sa02Printf("SetPositionAndMux %d %d \n", ix,iy);
         SetCtrlVal (p2h, P2_CHX,  ix);
         SetCtrlVal (p2h, P2_CHY,  iy);
         SetPositionAndMux(  p2h,0, EVENT_COMMIT , NULL,0,0);
+      }
-      }  else if (strstr(type,"Treshold")!=NULL) {
+      else if (strstr(type,"Treshold")!=NULL) {
         sscanf(line,"%*s%s",outputFileSuffix);
         GetCtrlVal (p1h, P1_SERIAL_1, HAPDserialNumber);
         sprintf(outputFile,"%s_%s.dat", HAPDserialNumber, outputFileSuffix);
         SetCtrlVal (p1h, P1_OUTPUTFILE, outputFile);
         sprintf(test,"Treshold scan to file %s",outputFile);
         sa02Printf("%s *\n\n", test);
         daq(NULL);
+      }
-      } else if (strstr(type,"Fitanje")!=NULL) {
+      else if (strstr(type,"Fitanje")!=NULL) {
         FitH2DCoarse(p3h, P3_CALIBRATION_2,EVENT_COMMIT,NULL,0,0);
         sa02Printf("Coarse fit parameters *\n\n");
+      }
-      } else if (strstr(type,"UploadChannelParameters")!=NULL) {
+      else if (strstr(type,"UploadChannelParameters")!=NULL) {
         UploadChannelParameters(p3h, P3_CPARLOAD,EVENT_COMMIT,NULL,0,0);
         sa02Printf("Loading channel parameters *\n\n");
+      }
-      } else if (strstr(type,"KalibracijaMizice")!=NULL) {
+      else if (strstr(type,"KalibracijaMizice")!=NULL) {
         SetHome(p2h, P2_HO,EVENT_COMMIT,NULL,0,0);
         SetCtrlVal(p2h,P2_XC,gCENTER_X);
         SetCtrlVal(p2h,P2_YC,gCENTER_Y);
         sa02Printf("Calibration *\n\n");
+      }
-      } else if (strstr(type,"LaserHVOn")!=NULL) {
+      else if (strstr(type,"LaserHVOn")!=NULL) {
         set_dac(1);
         sa02Printf("Low intensity laser *\n\n");
+      }
-      } else if (strstr(type,"LaserHVOff")!=NULL) {
+      else if (strstr(type,"LaserHVOff")!=NULL) {
         set_dac(0);
         sa02Printf("High intensity laser *\n\n");
+      }
-      } else if (strstr(type,"Gain")!=NULL) {
+      else if (strstr(type,"Gain")!=NULL) {
         sscanf(line,"%*s%d",paramValue);
         sprintf(test,"    %d", atoi(paramValue));
         sa02Printf("%s *\n\n", test);
         changeGlobalParam(12, atoi(paramValue)); // Global parameter Gain has ID 12
+      }
-      } else if (strstr(type,"ShapingTime")!=NULL) {
+      else if (strstr(type,"ShapingTime")!=NULL) {
         sscanf(line,"%*s%s",paramValue);
         sprintf(test,"    %d", atoi(paramValue));
         sa02Printf("%s *\n\n", test);
         changeGlobalParam(13, atoi(paramValue)); // Global parameter ShapingTime has ID 13
+      }
           GetTableSelection (p3h, P3_GREG, &trange);
           if ((trange.top!=0)&&(trange.left!=0)) {
             imin= trange.top - 1;
             imax= imin + trange.height;
+          }
-          } else {
+          else {
             if (!GetActiveTableCell(p3h, P3_GREG, &cell)) {
               imin = cell.y-1;
               imax = imin;
+            }
-            } else return 0;
+            else return 0;
+          }
+        }
-        } else {
+        else {
           imin=0;
           imax=4*4;
+        }
         for (i=imin; i<imax; i++) {
           state = GetTableSelection (p3h, P3_CREG, &trange);
           if ((trange.top!=0)&&(trange.left!=0)) {
             imin= trange.top-1;
             imax= imin + trange.height;
+          }
-          } else {
+          else {
             if (!GetActiveTableCell(p3h, P3_CREG, &cell)) {
               imin = cell.y-1;
               imax = imin+1;
+            }
-            } else return 0;
+            else return 0;
           }
+        }
-        } else if ((panel==p1h)&&(control==P1_CHPARLOAD)) {
+        else if ((panel==p1h)&&(control==P1_CHPARLOAD)) {
           GetCtrlVal(p1h,P1_NSLIX,&imin);
           imax=imin+1;
+        }
-        } else {
+        else {
           imin=0;
           imax=144*4;
+        }
         for (i=imin; i<imax; i++) {
           if (ctrl_c) {
             break;
+          }
+        }
         sa02Printf("Channel Parameters Uploaded to the ASICs\n");
       }
       SetCtrlAttribute (panel, control, ATTR_DIMMED, 0);
       break;
   }
   return 0;
 }
 int CVICALLBACK UploadFPGAParameters (int panel, int control, int event,
                                       void *callbackData, int eventData1, int eventData2) {
   int n=0;
   int i=0;
   char cmd[NDIM];
   char sasic[NDIM];
   uint32_t sa02code;
   uint32_t board;
   uint32_t response[2]= {0,0};
   switch (event) {
     case EVENT_COMMIT: {
       uint16_t mask=GetConnectedFebMask();
       SetCtrlAttribute (panel, control, ATTR_DIMMED, 1);
       GetNumTextBoxLines(p3h, P3_FPGAPAR,&n);
         if (strcmp(cmd,"MUXASIC")==0) {
           asic = sa02MuxMap(asic);
+        }
         for (board = 0; board < 4; board ++) if ( mask & (1 << board) ) sa02Cmd(board,sa02code, asic, 0, 0, 2,response);
         sa02Printf("%s\n",buf);
       }
       sa02Printf("FPGA Parameters Uploaded to FEBS\n");
       SetCtrlAttribute (panel, control, ATTR_DIMMED, 0);
       break;
+    }
+  }
   return 0;
+}
 int CVICALLBACK SetSelectionToVal (int panel, int control, int event,
                                    void *callbackData, int eventData1, int eventData2) {
   int state, input_cid=-1,output_cid=-1;
   Rect trange;
   unsigned short value;
+      }
       state = GetTableSelection (p3h, output_cid, &trange);
       if ((trange.top!=0)&&(trange.left!=0)) {
         GetCtrlVal(p3h,input_cid, &value);
         state = FillTableCellRange (p3h, output_cid, trange, value);
       }
       break;
+  }
   return 0;
+}
   int cid[4]= {P3_MUX0,P3_MUX1,P3_MUX2,P3_MUX3};
   int id=0,i;
   uint32_t sa02code;
   uint32_t board;
   uint32_t response[2]= {0,0};
   switch (event) {
     case EVENT_COMMIT:
       switch (control) {
         case P3_MUX0:
           id=0;
         if (id!= i) {
           SetCtrlVal(panel,cid[i],0);
+        }
+      }
       sa02Printf("MUX %d\n",id);
       break;
   }
   return 0;
 }
 int CVICALLBACK UploadFromPanels (int panel, int control, int event,
                                   void *callbackData, int eventData1, int eventData2) {
   switch (event) {
     case EVENT_COMMIT:
       UploadFPGAParameters(panel,control,event,callbackData,eventData1,eventData2);
       UploadChannelParameters(panel,control,event,callbackData,eventData1,eventData2);
       UploadGlobalParameters(panel,control,event,callbackData,eventData1,eventData2);
       break;
   }
   return 0;
 }
 double erf(double x, double par[], int npar) {
   double y=0;
   double x0= (x-par[0])*par[1];
   Erf(x0,&y);
   return (y);
 }
 int CVICALLBACK FitH2D (int panel, int control, int event,
                         void *callbackData, int eventData1, int eventData2) {
   char name[MAX_PATHNAME_LEN];
     case EVENT_COMMIT: {
       //sprintf(name ,"C:\\root\\bin\\root.exe");
       int status;
       char dfile[MAX_PATHNAME_LEN];
       char efile[MAX_PATHNAME_LEN];
       status = FileSelectPopup ("data", "*.th2d", ".th2d",
                                 "Izberi datoteko s histogramom",
                                 VAL_LOAD_BUTTON, 0, 0, 1, 0, efile);
       EscapeString(efile,dfile);
       sprintf(name ,"C:/root/bin/root.exe ../macros/sa02fit.cxx(\\\"%s\\\")", dfile);
       sa02Printf("%s\n",name);
       LaunchExecutable(name);
+    }
     break;
+  }
   return 0;
+}
   int ix= (int)x;
   if (x>0) {
     if (x - ix > 0.5 ) {
       return ix+1;
+    }
-    } else {
+    else {
       return ix;
     }
+  }
-  } else {
+  else {
     if (x - ix < -0.5 ) {
       return ix-1;
+    }
-    } else {
+    else {
       return ix;
+    }
+  }
   for (i=0; i<fNpoints; i++) {
     sumwx += fX[i]* fY[i];
     sumw += fY[i];
     sumwx2 += fX[i]* fX[i]* fY[i];
   }
   if (sumw <= 0) {
     return 0;
+  }
   mean = sumwx/sumw;
   rms2 = fabs(sumwx2/sumw -mean*mean);
         for (iy=0; iy < npt; iy++ ) {
           datay[iy] = H2DGetBinContent(h2,ix,iy); // /H2DGetMax(h2);
+        }
         FitGraph(fitmode, npt, datax , datay, fpar);
         mean[ix]=fpar[0];
-        rms[ix] =fpar[1];
+        rms[ix]=fpar[1];
         offset         = offsets[ix*2];
         fineadj_unipol = offsets[ix*2+1];
         x =  sa02getshift(offset, fineadj_unipol);
         x += (mean0-(mean[ix]+rms0*rms[ix]));
             PCLK    -> 0 -> CLK_IN    (internal clock)
       */
       if (value==2) {
         value=0x7600;
+      }
-      } else {
+      else {
         value=0;
+      }
       VME_A32D32_W(address+4,value); // enable outputs
+    }
     sa02Printf("SizeOf(Double)=%d\n",sizeof(double));
   if (scanpar>10) {
     cid=P3_GREG;
     spar=scanpar-10;
     nch=4*4;
+  }
-  } else {
+  else {
     cid=P3_CREG;
     spar=scanpar;
     nch=144*4;
+  }
   return 0;
+}
-int ProcessUserEvent(int pID, int rID,int mode){
+int ProcessUserEvent(int pID, int rID,int mode) {
-    ThreadFunctionPtr mythread = NULL;
+  ThreadFunctionPtr mythread = NULL;
-    if (pID ==p1h && rID == P1_DAQ            ) mythread=daq;
+  if (pID ==p1h && rID == P1_DAQ            ) mythread=daq;
-    if (pID ==p1h && rID == P1_READOUT        ) mythread=daq_readonly;
+  if (pID ==p1h && rID == P1_READOUT        ) mythread=daq_readonly;
-    if (pID ==p1h && rID == P1_FPGAWRITE      ) mythread=MultiFpgaWrite;
+  if (pID ==p1h && rID == P1_FPGAWRITE      ) mythread=MultiFpgaWrite;
-    if (pID ==p1h && rID == P1_MULTIFPGAWRITE ) mythread=MultiFpgaWrite;
+  if (pID ==p1h && rID == P1_MULTIFPGAWRITE ) mythread=MultiFpgaWrite;
-    if (pID ==p1h && rID == P1_TESTING        ) mythread=Testing;
+  if (pID ==p1h && rID == P1_TESTING        ) mythread=Testing;
-    if (pID ==p2h && rID == P2_DAQ            ) mythread=daq_scan;
+  if (pID ==p2h && rID == P2_DAQ            ) mythread=daq_scan;
-    if (pID ==p6h && rID == MINIRICH_START    ) mythread=daq;
+  if (pID ==p6h && rID == MINIRICH_START    ) mythread=daq;
-    if (pID ==p2h && rID == P2_RUNSCRIPT      ) {
+  if (pID ==p2h && rID == P2_RUNSCRIPT      ) {
-      char scriptname[MAX_PATHNAME_LEN] ;
+    char scriptname[MAX_PATHNAME_LEN] ;
-      int status = FileSelectPopup ("./scripts/", "*.txt", "*.txt",
+    int status = FileSelectPopup ("./scripts/", "*.txt", "*.txt",
-                                    "Select Script file", VAL_LOAD_BUTTON, 0, 0,
+                                  "Select Script file", VAL_LOAD_BUTTON, 0, 0,
 , 0, scriptname);
-      if (status) {
+    if (status) {
-        SetCtrlVal(p1h, P1_SCRIPTNAME, scriptname );
+      SetCtrlVal(p1h, P1_SCRIPTNAME, scriptname );
-        mythread=run_script;
+      mythread=run_script;
-      }
+    }
+  }
-    if (pID ==p1h && rID == P1_RUNSCRIPT      ) mythread=run_script;
+  if (pID ==p1h && rID == P1_RUNSCRIPT      ) mythread=run_script;
-    if (pID ==p3h && rID == P3_DAQ            ) mythread=daq_scanpar;
+  if (pID ==p3h && rID == P3_DAQ            ) mythread=daq_scanpar;
-    if (pID ==p4h && rID == P4_DAQ            ) mythread=V729_daq;
+  if (pID ==p4h && rID == P4_DAQ            ) mythread=V729_daq;
-    if (mythread!=NULL) {
+  if (mythread!=NULL) {
-      sa02Printf("New Thread panel=%d button=%d\n", pID, rID);
+    sa02Printf("New Thread panel=%d button=%d\n", pID, rID);
-      ctrl_c=0;
+    ctrl_c=0;
-      daq_on = 1;
+    daq_on = 1;
-      SetDimming(1);
+    SetDimming(1);
-      if (mode){
+    if (mode) {
-        CmtScheduleThreadPoolFunctionAdv (poolHandle, mythread, &rID,
+      CmtScheduleThreadPoolFunctionAdv (poolHandle, mythread, &rID,
                                         DEFAULT_THREAD_PRIORITY,
                                         EndOfThread,
                                         EVENT_TP_THREAD_FUNCTION_END,
                                         NULL, RUN_IN_SCHEDULED_THREAD,
                                         &tfID);
-      } else {
-        mythread(NULL);
-      }
-    }
-    if ( pID==p1h && rID == P1_SLOWC ) {
-      uint32_t board;
-      GetCtrlVal(p1h,P1_BOARDNUMBER, &board);
-      SlowControl(board, NULL);
-    }
-    // if ( pID==p1h && rID == P1_STEPONE )       StepOne();
-    if ( pID==p1h && rID == P1_FEBTESTANA ) FebTestAna();
-    if ( pID==p1h && rID == P1_TEST )       FebTest();
-    if ( pID==p1h && rID == P1_MODULETEST ) ModuleTest();
-    if ( pID==p1h && rID == P1_GET_FPGA_SERIAL ) {
-      int ison=0;
-      GetCtrlVal(p1h,P1_BOARDTYPE,&sa02BoardType);
-      for (int board=0; board<4; board++) {
-        char saddress[0xff]="";
-        GetCtrlVal(p1h, hapd_onoff[board], &ison);
-        sa02GetSerial(board, saddress);
-        sa02Printf("SERIAL FPGA = %s \n", saddress);
-        SetCtrlVal(p1h,fpga_serials[board],saddress);
-      }
-    };
-    if ( ( pID==p1h && rID == P1_STOP )
-         || ( pID==p2h && rID == P2_STOP )
-         || ( pID==p3h && rID == P3_STOP )
-         || ( pID==p6h && rID == MINIRICH_STOP )
-         || ( pID==p4h && rID == P4_STOP ) ) {
-      sa02Printf("Stopping the  Thread %d\n", tfID);
-      ctrl_c=1;
+    }
-    if (pID ==p5h) {
+    else {
-      if (rID == P5_SET_DAC_HV_ON) set_dac(1);
-      if (rID == P5_SET_DAC_HV_OFF) set_dac(0);
-      if (rID == P5_SET_HV_ON) set_hv(1);
+      mythread(NULL);
-      if (rID == P5_SET_HV_OFF) set_hv(0);
+    }
+  }
+  if ( pID==p1h && rID == P1_SLOWC ) {
+    uint32_t board;
+    GetCtrlVal(p1h,P1_BOARDNUMBER, &board);
+    SlowControl(board, NULL);
+  }
+  // if ( pID==p1h && rID == P1_STEPONE )       StepOne();
+  if ( pID==p1h && rID == P1_FEBTESTANA ) FebTestAna();
+  if ( pID==p1h && rID == P1_TEST )       FebTest();
+  if ( pID==p1h && rID == P1_MODULETEST ) ModuleTest();
+  if ( pID==p1h && rID == P1_GET_FPGA_SERIAL ) {
+    int ison=0;
+    GetCtrlVal(p1h,P1_BOARDTYPE,&sa02BoardType);
+    for (int board=0; board<4; board++) {
+      char saddress[0xff]="";
+      GetCtrlVal(p1h, hapd_onoff[board], &ison);
+      sa02GetSerial(board, saddress);
+      sa02Printf("SERIAL FPGA = %s \n", saddress);
+      SetCtrlVal(p1h,fpga_serials[board],saddress);
+    }
+  };
+  if ( ( pID==p1h && rID == P1_STOP )
+       || ( pID==p2h && rID == P2_STOP )
+       || ( pID==p3h && rID == P3_STOP )
+       || ( pID==p6h && rID == MINIRICH_STOP )
+       || ( pID==p4h && rID == P4_STOP ) ) {
+    sa02Printf("Stopping the  Thread %d\n", tfID);
+    ctrl_c=1;
+  }
+  if (pID ==p5h) {
+    if (rID == P5_SET_DAC_HV_ON) set_dac(1);
+    if (rID == P5_SET_DAC_HV_OFF) set_dac(0);
+    if (rID == P5_SET_HV_ON) set_hv(1);
+    if (rID == P5_SET_HV_OFF) set_hv(0);
+  }
-    return 0;
+  return 0;
 }
 void CVICALLBACK QueueUserEventCallback (CmtTSQHandle queueHandle, unsigned int event, int value, void *callbackData) {
   //int *data= (int *)  callbackData;
   int mdata[2];
                        LPSTR lpszCmdLine, int nCmdShow) {
   char title[0xFF];
   char saddress[0xff]="";
   //uint32_t board;
   int i;
   int status=0;
   if (InitCVIRTE (hInstance, 0, 0) == 0) {
     return -1;  /* out of memory */
+  }
   CmtNewThreadPool (MAX_THREADS,  &poolHandle);
   if ( (status = CmtNewTSQ (1, 2*sizeof(int), OPT_TSQ_AUTO_FLUSH_ALL, &pTSQ)) <0)
     printf("CmtNewTSQ cannot be installed\n");
   if ( (status = CmtInstallTSQCallback (pTSQ, EVENT_TSQ_ITEMS_IN_QUEUE, EVENT_TSQ_QUEUE_SIZE,
-                                       QueueUserEventCallback, pTSQData, CmtGetCurrentThreadID(), NULL))  <0)
+                                        QueueUserEventCallback, pTSQData, CmtGetCurrentThreadID(), NULL))  <0)
     printf("CmtInstallTSQCallback cannot be installed\n");  ;
   SetStdioPort (CVI_STDIO_WINDOW );
   readIni("febdaq.ini");
   if ((p1h = LoadPanel (0, "sa02_CVI.uir", P1)) < 0) return -1;
   if ((p2h = LoadPanel (0, "sa02_CVI.uir", P2)) < 0) return -1;
   if ((p3h = LoadPanel (0, "sa02_CVI.uir", P3)) < 0) return -1;
   if ((p4h = V729_LoadPanel (0, "CAEN_V729\\CAEN_V729_CVI.uir", P4)) < 0) return -1;
   if ((p5h = LoadPanel (0, "sa02_CVI.uir", P5)) < 0) return -1;
   if ((p6h = LoadPanel (0, "ICFA\\minirich.uir", MINIRICH)) < 0) return -1;
   if ((pm1 = LoadMenuBar (p1h, "sa02_CVI.uir", MENU)) < 0)  return -1;
   SetPanelMenuBar(p1h, pm1);
   DisplayPanel (p1h);
   LoadUirHeader("sa02_CVI.h");
   LoadUirHeader("CAEN_V729\\CAEN_V729_CVI.h");
   SetCtrlVal(p2h,P2_XC,gCENTER_X);
   SetCtrlVal(p2h,P2_YC,gCENTER_Y);
   SetCtrlVal(p3h, P3_INPUTFILE,gFEBParam);
   SetParametersFromFile(gFEBParam);
   SetCtrlAttribute (p1h, P1_GRAPH2D, ATTR_CALLBACK_DATA, (void *)integer_val);
   SetCtrlAttribute (p1h, P1_SLIY, ATTR_CALLBACK_DATA, (void *)integer_val);
   SetCtrlAttribute (p1h, P1_SLIX, ATTR_CALLBACK_DATA, (void *)integer_val);
   SetCtrlAttribute (p1h, P1_NSLIY, ATTR_CALLBACK_DATA, (void *)integer_val);
   SetCtrlAttribute (p1h, P1_NSLIX, ATTR_CALLBACK_DATA, (void *)integer_val);
   for (i=0; i<12; i++) {
     SetTraceAttributeEx (p1h, chart_control[0], i+1, ATTR_TRACE_LG_TEXT, (char *) slowcname[i]);
   }
   GetPanelAttribute (p1h, ATTR_TITLE, title );
   if (gVME_CONTROLLER == WIENER_VMEMM) sprintf( title, "%s + WIENER_VMEMM", title );
   if (gVME_CONTROLLER == WIENER_VMUSB) sprintf( title, "%s + WIENER_VMUSB", title );
   if (gVME_CONTROLLER == CAEN_V1718) sprintf( title, "%s + CAEN_V1718", title );
+  if (gVME_CONTROLLER == SIS3153_USB) sprintf( title, "%s + SIS3153_USB", title );
   if (gCAEN_V1495) sprintf( title, "%s + CAEN_V1495", title );
   if (gCAEN_V288 ) sprintf( title, "%s + CAEN_V288", title );
   if (gBELLEPTS) {
     sprintf( title, "%s + BELLEPTS", title );
     SetCtrlVal(p1h,hapd_onoff[i],gFEBMask&(1<<i));
   SetCtrlVal(p1h,P1_SENDSWTRIG,gTriggerType);
   SetCtrlVal(p1h,P1_TPENB,CHECK_BIT(uInterf,0));
   sa02SetAddress(strtoul (saddress,NULL,0));
   LedCB(p1h,P1_PTSLED,EVENT_COMMIT, NULL,0,0);
   StdIo2FileCB (p1h, P1_STDIOLOG, EVENT_COMMIT, NULL,0,0);
   InitColors();
   sa02Printf("Panels=%d %d %d %d\n", p1h, p2h,p3h,p4h);
   GetCtrlVal(p1h,P1_VERBOSE,&sa02Verbose);
   LoadElectronicMap("eid2hapdxy.map");
   icfa_Init();
   loop_on=1;
   do {
     GetUserEvent (1, &pID, &rID);
     ProcessUserEvent(pID,rID,1);
+  }
-  } while (loop_on);
+  while (loop_on);
   CmtDiscardThreadPool (poolHandle);
   DiscardPanel (p4h);
   DiscardPanel (p3h);
   DiscardPanel (p2h);
   DiscardPanel (p1h);
   if (gMIKRO_PORT) MIKRO_Close ();
   VME_STOP();
   return 0;
+}
 int CVICALLBACK ResetStdOut (int panel, int control, int event,
                              void *callbackData, int eventData1, int eventData2) {
   switch (event) {
   return 0;
+}
 int CVICALLBACK TrgHvMon (int panel, int control, int event,
                           void *callbackData, int eventData1, int eventData2) {
   switch (event) {
     case EVENT_TIMER_TICK:
       hvmon=1;
       break;
+  }
   return 0;
   dummyword = 0;
   do {
     if( (c = getc( fp )) == EOF ) {
       if(verbose) {
         sa02Printf( "EOF detected. Exit.\n");
       }
       return -1;
+    }
     (c == 0xff) ? dummyword++ : (dummyword=0);
+  }
-  } while( dummyword < 4 );
+  while( dummyword < 4 );
   if( mode == SLAVESERIAL_MODE ) {
     if(verbose)  sa02Printf("slave serial mode");
     Pts_write( addr +ADR_MODE, mode );
     Pts_erase( addr, verbose );
     for( j=0; j<32; j++ ) Pts_write( addr + ADR_CFG, 0x1 );
     while( (c=getc(fp))!=EOF ) {
       for( j=0; j<8; j++ ) Pts_write( addr + ADR_CFG, (c>>(7-j))&0x1 );
       nchar++;
       if( verbose && nchar%byte_per_dot==0 ) {
         sa02Printf( "#");
+      }
+    }
+  }
-  } else if( mode == SELECTMAP_MODE ) {
+  else if( mode == SELECTMAP_MODE ) {
     if( verbose ) sa02Printf("select map mode\n");
     Pts_write( addr + ADR_MODE, SELECTMAP_MODE );
     Pts_erase( addr, verbose );
     VME_MWRST();
     for( j=0; j<4; j++ ) Pts_Mwrite( addr + ADR_CFG, 0xff );
         sa02Printf( "#");
+      }
+    }
     VME_MWEXEC();
+  }
-  } else {
+  else {
     if(verbose) {
       sa02Printf( "\nIllegal mode\n");
+    }
     return -1;
     sa02Printf("CSR1(0x%02x)=0x%04x\n",ADR_CSR1,csr1_value&0xffff);
+  }
   if(csr1_value&CSR1_DONE) {
     if(verbose) sa02Printf("configure complete.\n");
     return 1;
+  }
-  } else {
+  else {
     if(verbose)  sa02Printf("configure not complete.");
     return -1;
+  }
+}
 int CVICALLBACK PtsDownloadCB (int panel, int control, int event,
                                void *callbackData, int eventData1, int eventData2) {
   char filename[254];
   int mode=0;
   char saddress[0xFF];
   uint32_t addr;
   switch (event) {
     case EVENT_COMMIT:
       GetCtrlVal(p3h,P3_ADDRESS, saddress);
       addr=  strtoul (saddress,NULL,0);
       GetCtrlVal(p3h,P3_PTSFIRMWARE,filename);
       GetCtrlVal(p3h,P3_PTSMODE,&mode);
       if(VME_CONNECTED() >=0 ) {
         Pts_configure_bit( addr , filename, mode,  1 );
+      }
-      } else {
+      else {
         MessagePopup ("Warning", "Connect VME!!");
+      }
       break;
+  }
   return 0;

Subversion Repositories f9daq

(root)/cvi/apps/sa02_daq/cvi/sa02_CVI.c – Rev 326 → 357