added data structure file for m03 T mounting and data structure for m02

slsDetectorCalibration/moench02Ctb10GbData.h

@@ -0,0 +1,246 @@
+#ifndef MOENCH02CTB10GBDATA_H
+#define  MOENCH02CTB10GBDATA_H
+#include <stdio.h>
+#include "slsDetectorData.h"
+#include "slsReceiverData.h"
+
+
+class moench02Ctb10GbData : public slsReceiverData<uint16_t> {
+
+ private:
+  
+  int iframe;
+  // int *xmap, *ymap;
+  int nadc;
+  int sc_width;
+  int sc_height;
+
+  int maplength;
+
+
+
+ public:
+
+
+
+
+  /**
+     Implements the slsReceiverData structure for the moench02 prototype read out by a module i.e. using the slsReceiver
+     (160x160 pixels, 40 packets 1286 large etc.)
+     \param c crosstalk parameter for the output buffer
+
+  */
+  
+
+ moench02Ctb10GbData(int ns=6400): slsReceiverData<uint16_t>(160, 160, 50, 8208) , nadc(4), sc_width(40), sc_height(160) {
+
+    
+    int adc_nr[4]={120,0,80,40};
+    int row, col;
+
+    int isample;
+    int iadc;
+    int ix, iy;
+    int i;
+    int npackets=50;
+    maplength = 8208*npackets;
+    //this->setDataSize(maplength);
+    /* maplength=this->getDataSize()/2; */
+    
+    for (int ip=0; ip<npackets; ip++) {
+      for (int is=0; is<128; is++) {
+
+	for (iadc=0; iadc<nadc; iadc++) {
+	  i=128*ip+is;
+	  if (i<sc_width*sc_height) {
+	    col=adc_nr[iadc]+(i%sc_width);
+	    row=i/sc_width;
+	    dataMap[row][col]=(32*i+iadc+2)*2+16*(ip+1);
+	    if (dataMap[row][col]<0 || dataMap[row][col]>=8208*npackets) {
+	      cout << "Error: pointer " << dataMap[row][col] << " out of range "<< endl;	  
+	    }
+	  
+	  }
+	}
+      }
+    }
+    int ibyte;
+    int ii=0;
+
+    for (int ipacket=0; ipacket<npackets; ipacket++) {
+      for (int ibyte=0;  ibyte< 8208/2; ibyte++) {
+	i=ipacket*8208/2+ibyte;
+	if(ibyte<8){
+	  xmap[i]=-1;
+	  ymap[i]=-1;
+	}else{
+	  isample=ii/32;
+	  iadc=ii%32;
+	  ix=isample%sc_width;
+	  iy=isample/sc_width;
+	  if(iadc>=2 && iadc<=5){
+	    xmap[i]=adc_nr[iadc-2]+ix;
+	    ymap[i]=iy;
+	  }else{
+	    xmap[i]=-1;
+	    ymap[i]=-1;
+	  }
+	  ii++;
+	}
+      }//end loop on bytes
+    }//end loop on packets
+
+    iframe=0;
+    cout << "data struct created" << endl;
+  };
+    
+  void getPixel(int ip, int &x, int &y) {
+    if(ip>=0 && ip<maplength){
+      x=xmap[ip]; 
+      y=ymap[ip];
+    }else{
+      cerr<<"WRONG ARRAY LENGTH"<<endl;
+      cerr<<"Trying to access the "<<ip<<"-th element"<<endl;
+    }
+
+  };
+  
+
+  /**
+
+     Returns the frame number for the given dataset. Purely virtual func.
+     \param buff pointer to the dataset
+     \returns frame number
+
+  */
+
+  int getFrameNumber(char *buff){return *((int*)buff)&0xffffffff;};  
+  /* virtual  int getFrameNumber(char *buff){(void)buff; return iframe;};    */
+
+  /**
+
+     Returns the packet number for the given dataset. purely virtual func
+     \param buff pointer to the dataset
+     \returns packet number number
+
+ 
+     virtual int getPacketNumber(char *buff)=0;
+
+  */
+  int getPacketNumber(char *buff){return ((*(((int*)(buff+4))))&0xff)+1;};  
+  /**
+
+     Loops over a memory slot until a complete frame is found (i.e. all packets 0 to nPackets, same frame number). purely virtual func
+     \param data pointer to the memory to be analyzed
+     \param ndata reference to the amount of data found for the frame, in case the frame is incomplete at the end of the memory slot
+     \param dsize size of the memory slot to be analyzed
+     \returns pointer to the beginning of the last good frame (might be incomplete if ndata smaller than dataSize), or NULL if no frame is found 
+
+  */
+  //virtual  char *findNextFrame(char *data, int &ndata, int dsize){ndata=dsize; setDataSize(dsize);  return data;};
+
+
+  /**
+
+     Loops over a file stream until a complete frame is found (i.e. all packets 0 to nPackets, same frame number). Can be overloaded for different kind of detectors! 
+     \param filebin input file stream (binary)
+     \returns pointer to the begin of the last good frame, NULL if no frame is found or last frame is incomplete
+
+  */
+  /* virtual char *readNextFrame(ifstream &filebin){ */
+  /*   //	int afifo_length=0;   */
+  /*   uint16_t *afifo_cont;  */
+  /*   int ib=0; */
+  /*   if (filebin.is_open()) { */
+  /* 	afifo_cont=new uint16_t[dataSize/2]; */
+  /* 	while (filebin.read(((char*)afifo_cont)+ib,2)) { */
+  /* 	  ib+=2; */
+  /* 	  if (ib==dataSize) break; */
+  /* 	} */
+  /* 	if (ib>0) { */
+  /* 	  iframe++; */
+  /* 	  //cout << ib << "-" << endl; */
+  /* 	  return (char*)afifo_cont; */
+  /* 	} else { */
+  /* 	  delete [] afifo_cont; */
+  /* 	  return NULL; */
+  /* 	} */
+  /*   }      */
+  /*   return NULL; */
+  /* }; */
+  virtual char *readNextFrame(ifstream &filebin, int& ff, int &np) {
+    char *data=new char[packetSize*nPackets];
+    char *retval=0;
+    int nd;
+    np=0;
+    int  pn;
+    char aa[8224]={0};
+    char *packet=(char *)aa;
+    int  fnum = -1;
+    if (ff>=0)
+      fnum=ff;
+
+    if (filebin.is_open()) {
+
+
+      cout << "+";
+
+      while(filebin.read((char*)packet, 8208)){
+	      
+	pn=getPacketNumber(packet);
+	if (fnum<0)
+	  fnum= getFrameNumber(packet);
+	
+
+	if (fnum>=0) {
+	  if (getFrameNumber(packet) !=fnum) { 
+	    
+	    if (np==0){
+	      cout << "-";
+	      delete [] data;
+	      return NULL;
+	    } else
+	      filebin.seekg(-8208,ios_base::cur);
+	    return data;
+	  }
+	
+	  memcpy(data+(pn-1)*packetSize, packet, packetSize);
+
+	  np++;
+	  if (np==nPackets)
+	    break;
+	  if (pn==nPackets)
+	    break;
+	}
+      }	    
+    }else{
+      cerr<<filebin<<" not open!!!"<<endl;
+      return NULL;
+    }
+	  
+    if (np==0){
+      cout << "?";
+      delete [] data;
+      return NULL;
+    }// else if (np<nPackets)
+    //  cout << "Frame " << fnum << " lost "  << nPackets-np << " packets " << endl;
+
+    
+    return data;
+	  
+  };
+
+
+
+  virtual char *readNextFrame(ifstream &filebin) {
+    int fnum=-1, np;
+    return readNextFrame(filebin, fnum, np);
+  };
+
+  
+
+};
+
+
+
+#endif

slsDetectorCalibration/moench02CtbData.h

@@ -41,7 +41,6 @@ class moench02CtbData : public slsDetectorData<uint16_t> {
     int iadc;
     int ix, iy;
     maplength=this->getDataSize()/2;
-    cerr<<"Map Array Length: "<<maplength<<endl;
     
 
     for (iadc=0; iadc<nadc; iadc++) {
@@ -70,7 +69,7 @@ class moench02CtbData : public slsDetectorData<uint16_t> {
       }
     }
     iframe=0;
-    //  cout << "data struct created" << endl;
+    cout << "data struct created" << endl;
   };
     
   void getPixel(int ip, int &x, int &y) {
@@ -138,7 +137,7 @@ class moench02CtbData : public slsDetectorData<uint16_t> {
 	}
 	if (ib>0) {
 	  iframe++;
-	  cout << ib << "-" << endl;
+	  //cout << ib << "-" << endl;
 	  return (char*)afifo_cont;
 	} else {
 	  delete [] afifo_cont;

slsDetectorCalibration/moench03TCtb10GbData.h

@@ -0,0 +1,247 @@
+#ifndef MOENCH03TCTB10GBDATA_H
+#define  MOENCH03TCTB10GBDATA_H
+#include "slsReceiverData.h"
+
+
+
+class moench03TCtb10GbData : public slsReceiverData<uint16_t> {
+ 
+ private:
+  
+  int iframe;
+  int nadc;
+  int sc_width;
+  int sc_height;
+ public:
+
+
+
+
+  /**
+     Implements the slsReceiverData structure for the moench02 prototype read out by a module i.e. using the slsReceiver
+     (160x160 pixels, 40 packets 1286 large etc.)
+     \param c crosstalk parameter for the output buffer
+
+  */
+  
+
+  //  moench03TCtb10GbData(int ns=5000): slsDetectorData<uint16_t>(400, 400, 8208*40, NULL, NULL) , nadc(32), sc_width(25), sc_height(200) {
+ moench03TCtb10GbData(int ns=5000): slsReceiverData<uint16_t>(400, 400, 40, 8208), nadc(32), sc_width(25), sc_height(200) {
+
+    int adc_nr[32]={300,325,350,375,300,325,350,375,		\
+		    200,225,250,275,200,225,250,275,\
+		    100,125,150,175,100,125,150,175,\
+		    0,25,50,75,0,25,50,75};
+    int row, col;
+
+    int isample;
+    int iadc;
+    int ix, iy;
+    
+    int npackets=40;
+    int i;
+    int adc4(0);
+
+    for (int ip=0; ip<npackets; ip++) {
+      for (int is=0; is<128; is++) {
+
+	for (iadc=0; iadc<nadc; iadc++) {
+	  i=128*ip+is;
+	  adc4=(int)iadc/4;
+	  if (i<sc_width*sc_height) {
+	    //  for (int i=0; i<sc_width*sc_height; i++) {
+	    col=adc_nr[iadc]+(i%sc_width);
+	    if (adc4%2==0) {
+	      row=199-i/sc_width; 	            
+	    } else {
+	      row=200+i/sc_width;
+	    }
+	    dataMap[row][col]=(nadc*i+iadc)*2+16*(ip+1);
+	    if (dataMap[row][col]<0 || dataMap[row][col]>=8208*40)
+	      cout << "Error: pointer " << dataMap[row][col] << " out of range "<< endl;
+	  }
+	}
+      }
+    }
+
+    int ipacket;
+    int ibyte;
+    int ii=0;
+    
+    for (int ipacket=0; ipacket<npackets; ipacket++) {
+      for (int ibyte=0;  ibyte< 8208/2; ibyte++) {
+	i=ipacket*8208/2+ibyte;
+	if (ibyte<8) {
+	//header!
+	  xmap[i]=-1;
+	  ymap[i]=-1;
+	} else {
+	  // ii=ibyte+128*32*ipacket;
+	  isample=ii/nadc;
+	  iadc=ii%nadc;
+	  adc4 = (int)iadc/4;
+
+	  ix=isample%sc_width;
+	  iy=isample/sc_width;
+	  if (adc4%2==0) {
+	    xmap[i]=adc_nr[iadc]+ix;
+	    ymap[i]=ny/2-1-iy;
+
+
+
+	  } else {
+	    xmap[i]=adc_nr[iadc]+ix;
+	    ymap[i]=ny/2+iy;
+
+	  }
+	  
+	ii++;
+	}
+      }
+    }
+    
+
+    
+    
+    iframe=0;
+    //  cout << "data struct created" << endl;
+  };
+    
+
+     /**
+
+     Returns the frame number for the given dataset. Purely virtual func.
+     \param buff pointer to the dataset
+     \returns frame number
+
+  */
+
+
+  int getFrameNumber(char *buff){return *((int*)buff)&0xffffffff;};   
+
+  /**
+
+     Returns the packet number for the given dataset. purely virtual func
+     \param buff pointer to the dataset
+     \returns packet number number
+
+
+
+  */
+  int getPacketNumber(char *buff){return ((*(((int*)(buff+4))))&0xff)+1;};   
+
+/*    /\** */
+
+/*      Loops over a memory slot until a complete frame is found (i.e. all packets 0 to nPackets, same frame number). purely virtual func */
+/*      \param data pointer to the memory to be analyzed */
+/*      \param ndata reference to the amount of data found for the frame, in case the frame is incomplete at the end of the memory slot */
+/*      \param dsize size of the memory slot to be analyzed */
+/*      \returns pointer to the beginning of the last good frame (might be incomplete if ndata smaller than dataSize), or NULL if no frame is found  */
+
+/*   *\/ */
+/*     virtual  char *findNextFrame(char *data, int &ndata, int dsize){ndata=dsize; setDataSize(dsize);  return data;}; */
+
+
+/*    /\** */
+
+/*      Loops over a file stream until a complete frame is found (i.e. all packets 0 to nPackets, same frame number). Can be overloaded for different kind of detectors!  */
+/*      \param filebin input file stream (binary) */
+/*      \returns pointer to the begin of the last good frame, NULL if no frame is found or last frame is incomplete */
+
+/*   *\/ */
+/*     virtual char *readNextFrame(ifstream &filebin){ */
+/*       //	int afifo_length=0;   */
+/*       uint16_t *afifo_cont;  */
+/*       int ib=0; */
+/*       if (filebin.is_open()) { */
+/* 	afifo_cont=new uint16_t[dataSize/2]; */
+/*  	while (filebin.read(((char*)afifo_cont)+ib,2)) { */
+/* 	  ib+=2; */
+/* 	  if (ib==dataSize) break; */
+/* 	} */
+/* 	if (ib>0) { */
+/* 	  iframe++; */
+/* 	  // cout << ib << "-" << endl; */
+/* 	  return (char*)afifo_cont; */
+/* 	} else { */
+/* 	  delete [] afifo_cont; */
+/* 	  return NULL; */
+/* 	} */
+/*       }      */
+/*       return NULL; */
+/*     }; */
+
+
+  virtual char *readNextFrame(ifstream &filebin, int& ff, int &np) {
+	  char *data=new char[packetSize*nPackets];
+	  char *retval=0;
+	  int nd;
+	  np=0;
+	  int  pn;
+	  char aa[8224]={0};
+	  char *packet=(char *)aa;
+	  int  fnum = -1;
+	  
+	  if (ff>=0)
+	    fnum=ff;
+
+	  if (filebin.is_open()) {
+
+
+	    cout << "+";
+
+	    while(filebin.read((char*)packet, 8208)){
+	      
+	      pn=getPacketNumber(packet);
+	      
+	      if (fnum<0)
+		fnum= getFrameNumber(packet);
+	      
+	      if (fnum>=0) {
+		if (getFrameNumber(packet) !=fnum) { 
+		  
+		  if (np==0){
+		    cout << "-";
+		    delete [] data;
+		    return NULL;
+		  } else
+		    filebin.seekg(-8208,ios_base::cur);
+
+		    return data;
+		}
+		
+		memcpy(data+(pn-1)*packetSize, packet, packetSize);
+		np++;
+		if (np==nPackets)
+		  break;
+		if (pn==nPackets)
+		  break;
+	      }
+	    }
+	    
+	  }
+	  
+	  if (np==0){
+	    cout << "?";
+	    delete [] data;
+	    return NULL;
+	  }// else if (np<nPackets)
+	    //  cout << "Frame " << fnum << " lost "  << nPackets-np << " packets " << endl;
+
+	  return data;
+	  
+	};
+
+
+
+  	virtual char *readNextFrame(ifstream &filebin) {
+	  int fnum=-1, np;
+	  return readNextFrame(filebin, fnum, np);
+	};
+
+};
+
+
+
+
+#endif

slsDetectorCalibration/moenchReadDataMT.C

@@ -1,6 +1,5 @@
 #include <TFile.h>
 #include <TThread.h>
-#include <THStack.h>
 #include "moenchReadData.C"
 
 typedef struct task_s{
@@ -10,7 +9,6 @@ typedef struct task_s{
   int runmin;
   int runmax;
   int treeIndex;
-  double xTalk;
 } Task;
 
 void *moenchMakeTreeTask(void *p){
@@ -21,16 +19,13 @@ void *moenchMakeTreeTask(void *p){
   TFile *f = new TFile(fname,"RECREATE");
   cout << "Call moenchReadData(" << t->fformat << "," << t->tname << "," << t->runmin<< "," << t->runmax <<")" << endl;
   TThread::UnLock();
-  THStack *s = moenchReadData(t->fformat,t->tname,t->runmin,t->runmax, 1500, -500, 1000, 1, t->xTalk);
+  moenchReadData(t->fformat,t->tname,t->runmin,t->runmax);
-  s->Write();
+  f->Close();
-  if(f && f->IsOpen()){
-    f->Close();
-  }
   return 0;
 }
 
 
-void moenchReadDataMT(char *fformat, char *tit, char *tdir, int runmin, int runoffset, int nThreads, int treeIndexStart=0, double xTalk=0.044){
+void moenchReadDataMT(char *fformat, char *tit, char *tdir, int runmin, int runoffset, int nThreads, int treeIndexStart=0){
   char threadName[1000];
   TThread *threads[nThreads];
   for(int i = 0; i < nThreads; i++){
@@ -42,7 +37,6 @@ void moenchReadDataMT(char *fformat, char *tit, char *tdir, int runmin, int runo
     t->runmin = runmin + i*runoffset;
     t->runmax = runmin + (i+1)*runoffset - 1;
     t->treeIndex = treeIndexStart + i;
-    t->xTalk = xTalk;
     cout << "start thread " << i << " start: " << t->runmin << " end " << t->runmax << endl;
     threads[i] = new TThread(threadName, moenchMakeTreeTask, t);
     threads[i]->Run();
@@ -56,27 +50,3 @@ void moenchReadDataMT(char *fformat, char *tit, char *tdir, int runmin, int runo
 
 
 
-
-//to compile: g++ -DMYROOT -DMYROOT1 -g `root-config --cflags --glibs` -o moenchReadDataMT moenchReadDataMT.C
-int main(int argc, char **argv){
-  if(argc < 8){ 
-    cout << "Usage: " << argv[0] << " fformat tit tdir runmin runoffset nThreads treeIndexStart [xTalkFactor]"  << endl; 
-    exit(-1); 
-  }
-
-  char *fformat = argv[1];
-  char *tit = argv[2];
-  char *tdir = argv[3];
-  int runmin = atoi(argv[4]);
-  int runoffset = atoi(argv[5]);
-  int nThreads = atoi(argv[6]);
-  int treeIndexStart = atoi(argv[7]);
-  double xTalkFactor = 0.044;
-
-  if(argc == 9)
-    xTalkFactor = atof(argv[8]);  
-
-  moenchReadDataMT(fformat, tit, tdir,runmin,runoffset,nThreads,treeIndexStart, xTalkFactor);
-  
-}
-