Index: hvcontrol/src/HVCalib.cc
===================================================================
--- hvcontrol/src/HVCalib.cc	(revision 40)
+++ hvcontrol/src/HVCalib.cc	(revision 40)
@@ -0,0 +1,192 @@
+
+/************************************************************************* \
+
+  Name:         HVCalib.cc
+
+  Created by:   Luisa Sabrina Stark Schneebeli, April 2009
+                sabrina.stark@phys.ethz.ch
+
+  Contents:     Class reading the calibration tabel for DAC to HV values
+
+\*************************************************************************/
+
+
+#include "HVCalib.h"
+#include <stdio.h>
+#include <iostream>
+#include <fstream>
+#include <math.h>
+using namespace std;
+
+
+
+
+
+HVCalib::HVCalib(HVConfig* hvConfig) {
+
+  char calibfile[80];
+  int idac, idacOld;
+  int istep, ihv1000, ihvOld;
+  char dLine[6000];
+  bool first = true;
+  float hv1000,dac;
+  double intpart;
+
+  iDACMin = hvConfig->DACMin;
+  fHVCalibSlope = hvConfig->fHVCalibSlope;
+  NDACValues = hvConfig->DACMax - hvConfig->DACMin;
+  NHVValues = 10*NDACValues;
+
+
+  HVArray = new float***[hvConfig->NumHVBoards];
+  for(int i=0; i<hvConfig->NumHVBoards; i++) {
+    HVArray[i] = new float**[NCHAIN];
+    for(int j=0; j<NCHAIN; j++) {
+      HVArray[i][j] = new float*[NCHANNEL];
+      for(int k=0; k<NCHANNEL; k++) {
+	HVArray[i][j][k] = new float[NDACValues];
+      }
+    }
+  }
+
+  DACArray = new int***[hvConfig->NumHVBoards];
+  for(int i=0; i<hvConfig->NumHVBoards; i++) {
+    DACArray[i] = new int**[NCHAIN];
+    for(int j=0; j<NCHAIN; j++) {
+      DACArray[i][j] = new int*[NCHANNEL];
+      for(int k=0; k<NCHANNEL; k++) {
+	DACArray[i][j][k] = new int[NHVValues];
+      }
+    }
+  }
+
+
+
+  for(int i=0; i<hvConfig->NumHVBoards; i++){
+  //  for(int i=0; i<1; i++){
+    for(int j=0;j<NCHAIN;j++){
+      //for(int j=0;j<1;j++){
+      sprintf(calibfile,"Calib/%s_%c%d.txt",hvConfig->fUSBDevice[i],65+j,1); 
+      //      printf("Calibration tabel 0: %s\n", calibfile);
+      ifstream fin(calibfile);
+
+      while(fin){
+	fin >> dac;
+	idacOld = 0;
+	if ((int)dac >= hvConfig->DACMin) {
+	  if (first){
+	    iDACMin = (int)dac;
+	    first = false;
+	  }
+	  idac = (int)dac - iDACMin;
+	  istep = idac - idacOld;
+	  for(int k=0;k<NCHANNEL;k++){
+	    fin>>HVArray[i][j][k][idac];
+	    for (int l=1; l<istep;l++){
+	      HVArray[i][j][k][idac-istep+l] = HVArray[i][j][k][idac-istep] + l*(HVArray[i][j][k][idac]-HVArray[i][j][k][idac-istep])/istep;
+	      //	      printf(" HVArray: %d  %f \n", idac-istep+l, HVArray[i][j][0][idac-istep+l]);
+	      //	      if (idac > 11240-iDACMin)
+	      //		return;
+	    }
+	  }
+	  idacOld = idac;
+	}
+	else{
+	  fin.getline(dLine,6000,'\n'); // Skip low voltage region
+	}
+      }
+    }
+  }
+
+  //  for(int i=0; i<hvConfig->NumHVBoards; i++){
+    for(int i=0; i<1; i++){
+      //  for(int j=0;j<NCHAIN;j++){
+      for(int j=0;j<1;j++){
+	//      for(int k=0;k<NCHANNEL;k++){
+      for(int k=0;k<1;k++){
+	ihvOld = 0;
+	first = true;
+	for (int l=0; l<NDACValues;l++){
+	  if (l == 0){
+	    ihvOld = 0;
+	    DACArray[i][j][k][0] = iDACMin;	    
+	    //	    printf("first :  DACArray[i][j][k][0] = %d, ihvOld = %d, i %d, j %d, k %d\n",  DACArray[i][j][k][0], ihvOld,i,j,k);
+	  }
+	  hv1000 = (HVArray[i][j][k][l] - HVArray[i][j][k][0]) * 1000;
+	  if (modf(hv1000,&intpart) >= 0.5){
+	    ihv1000 = (int)((hv1000>=0)?ceil(hv1000):floor(hv1000));
+	  }
+	  else {
+	    ihv1000 = (int)((hv1000<0)?ceil(hv1000):floor(hv1000));
+	  }
+	  if (ihv1000 <= ihvOld){
+	    continue;
+	  }
+	  else if (ihv1000 > ihvOld){
+	    for (int m=0; m<(ihv1000-ihvOld);m++){
+	      DACArray[i][j][k][ihvOld+m] = l+iDACMin;
+	      //printf("HV = %d, HVArr = %f, DACArray = %d, m = %d. \n",ihvOld+m,HVArray[i][j][k][l],DACArray[i][j][k][ihvOld+m],m);
+	    //	    printf("DACArray[i][j][k][0] = %d\n",  DACArray[i][j][k][0]);	    
+	    }
+	    ihvOld = ihv1000;
+	  }
+	}	
+      }
+    }
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////
+
+HVCalib::~HVCalib() {
+
+
+  for (int i=0; i<MAX_NUM_HVBOARDS; i++){
+    for (int j=0; j<NCHAIN;j++){
+      for (int k=0; k<NCHANNEL;k++){
+	delete [] HVArray[i][j][k];
+	delete [] HVArray;
+      }
+    }
+  }
+
+  for (int i=0; i<MAX_NUM_HVBOARDS; i++){
+    for (int j=0; j<NCHAIN;j++){
+      for (int k=0; k<NCHANNEL;k++){
+	delete [] DACArray[i][j][k];
+	delete [] DACArray;
+      }
+    }
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////
+
+float HVCalib::DACToHV(int dac, int board, int chain, int channel) {
+  if (dac < iDACMin){
+    return HVArray[board][chain][channel][0] + (dac - iDACMin)*fHVCalibSlope;
+  }
+  else
+    return HVArray[board][chain][channel][dac-iDACMin];
+
+}
+/////////////////////////////////////////////////////////////////////////
+
+int HVCalib::HVToDAC(float hv, int board, int chain, int channel) {
+  if (hv < HVArray[board][chain][channel][0]){
+        return iDACMin + (int)((hv - HVArray[board][chain][channel][0])/fHVCalibSlope);
+  }
+  else{
+    int ihv = 0;
+    double intpart;
+    float hv1000 = (hv-HVArray[board][chain][channel][0])*1000.;
+    if (modf(hv1000,&intpart) >= 0.5){
+      ihv = (int)((hv1000>=0)?ceil(hv1000):floor(hv1000));
+    }
+    else {
+      ihv = (int)((hv1000<0)?ceil(hv1000):floor(hv1000));
+    }
+    return DACArray[board][chain][channel][ihv];
+  }
+}
+
Index: hvcontrol/src/HVCalib.h
===================================================================
--- hvcontrol/src/HVCalib.h	(revision 40)
+++ hvcontrol/src/HVCalib.h	(revision 40)
@@ -0,0 +1,39 @@
+
+#ifndef HVCALIB_H_SEEN
+#define HVCALIB_H_SEEN
+
+
+#include <string.h>
+#include <HVConfig.h>
+#include "Types.h"
+
+#define NCHAIN 4
+#define NCHANNEL 32
+
+
+class HVCalib {
+
+  // privat:
+  float ****HVArray;
+  int ****DACArray;
+
+  
+  int NDACValues;
+  int NHVValues;
+
+ public:
+
+
+  HVCalib(HVConfig *hvConfig);
+  ~HVCalib();
+
+  int iDACMin;
+  float fHVCalibSlope;
+
+  int HVToDAC(float hv, int board, int chain, int channel);
+  float DACToHV(int dac, int board, int chain, int channel);
+
+
+};
+
+#endif