added moenchT1 data structure

slsDetectorCalibration/MovingStat.h

@@ -25,6 +25,16 @@ class MovingStat
 	  m_newM=0; 
 	  m_newM2=0;
         }
+
+	/**
+	   clears the moving average number of samples parameter, mean and standard deviation
+	*/
+        void Set(double val)
+        {
+	  m_n = n; 
+	  m_newM=val*n; 
+	  m_newM2=val*val*n;
+        }
 	
 	
 	/** sets number of samples parameter

slsDetectorCalibration/moench03Ctb10GbData.h

@@ -211,6 +211,7 @@ class moench03Ctb10GbData : public slsReceiverData<uint16_t> {
 
 	};
 
+int getPacketNumber(int x, int y) {return dataMap[y][x]/8208;};
 
   	virtual char *readNextFrame(ifstream &filebin) {
 	  int fnum;

slsDetectorCalibration/moench03Ctb10GbT1Data.h

@@ -0,0 +1,236 @@
+#ifndef MOENCH03CTB10GBT1DATA_H
+#define  MOENCH03CTB10GBT1DATA_H
+#include "slsReceiverData.h"
+
+
+
+class moench03Ctb10GbData : 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
+
+  */
+  
+
+  //  moench03Ctb10GbData(int ns=5000): slsDetectorData<uint16_t>(400, 400, 8208*40, NULL, NULL) , nadc(32), sc_width(25), sc_height(200) {
+ moench03Ctb10GbT1Data(int ns=5000): slsReceiverData<uint16_t>(400, 400, 40, 8208), nadc(32), sc_width(25), sc_height(200) {
+
+    int adc_nr[32]={200,225,250,275,300,325,350,375,\
+		    0,25,50,75,100,125,150,175,\
+		    175,150,125,100,75,50,25,0,\
+		    375,350,325,300,275,250,225,200};
+    int row, col;
+
+    int isample;
+    int iadc;
+    int ix, iy;
+    
+    int npackets=40;
+    int i;
+
+
+    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) {
+	    //  for (int i=0; i<sc_width*sc_height; i++) {
+	    col=adc_nr[iadc]+(i%sc_width);
+	    if (iadc<16) {
+	      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;
+	
+	  ix=isample%sc_width;
+	  iy=isample/sc_width;
+	  if (iadc<(nadc/2)) {
+	    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
+
+  */
+
+/* class jfrau_packet_header_t { */
+/*  public: */
+/* 	unsigned char emptyHeader[6]; */
+/* 	unsigned char reserved[4]; */
+/* 	unsigned char packetNumber[1]; */
+/* 	unsigned char frameNumber[3]; */
+/* 	unsigned char bunchid[8]; */
+/* }; */
+
+
+
+ int getFrameNumber(char *buff){return *((int*)(buff+5))&0xffffff;};   
+
+  /**
+
+     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& fnum) {
+	  char *data=new char[packetSize*nPackets];
+	  char *retval=0;
+	  int np=0, nd;
+	  fnum = -1;
+	  int  pn;
+	  char aa[8224];
+	  char *packet=(char *)aa;
+
+	  if (filebin.is_open()) {
+
+
+
+
+	    while(filebin.read((char*)packet, 8208) && np<nPackets){
+	      pn=getPacketNumber(packet);
+	      
+	      if (pn==1 && fnum<0)
+		fnum= getFrameNumber(packet);
+	      
+	      // cout << "fn: " << fnum << "\t pn: " << pn << endl;
+	      if (fnum>=0) {
+		if (getFrameNumber(packet) !=fnum) { 
+		  
+		  if (np==0){
+		    delete [] data;
+		    return NULL;
+		  } else
+		    return data;
+		}
+		
+		memcpy(data+(pn-1)*packetSize, packet, packetSize);
+		np++;
+		
+	      }
+	    }
+	    
+	  }
+
+	  if (np==0){
+	    delete [] data;
+	    return NULL;
+	  }
+
+	};
+
+int getPacketNumber(int x, int y) {return dataMap[y][x]/8208;};
+
+  	virtual char *readNextFrame(ifstream &filebin) {
+	  int fnum;
+	  return readNextFrame(filebin, fnum);
+	};
+
+};
+
+
+
+
+#endif

slsDetectorCalibration/moench03CtbData.h

@@ -4,7 +4,7 @@
 
 
 
-class moench03CtbData : public slsDetectorData<uint16_t> {
+class moench03TCtbData : public slsDetectorData<uint16_t> {
 
  private:
   
@@ -25,7 +25,7 @@ class moench03CtbData : public slsDetectorData<uint16_t> {
   */
   
 
-  moench03CtbData(int ns=5000): slsDetectorData<uint16_t>(400, 400, ns*2*32, NULL, NULL) , nadc(32), sc_width(25), sc_height(200) {
+  moench03TCtbData(int ns=5000): slsDetectorData<uint16_t>(400, 400, ns*2*32, NULL, NULL) , nadc(32), sc_width(25), sc_height(200) {
 
     
     int adc_nr[32]={200,225,250,275,300,325,350,375,\

slsDetectorCalibration/moench03TCtb10GbData.h

@@ -232,7 +232,7 @@ class moench03TCtb10GbData : public slsReceiverData<uint16_t> {
 	  
 	};
 
-
+int getPacketNumber(int x, int y) {return dataMap[y][x]/8208;};
 
   	virtual char *readNextFrame(ifstream &filebin) {
 	  int fnum=-1, np;

slsDetectorCalibration/pedestalSubtraction.h

@@ -39,8 +39,11 @@ class pedestalSubtraction  {
     */
     virtual int SetNPedestals(int i=-1) {if (i>0) stat.SetN(i); return stat.GetN();};
     
+    /** sets the moving average */
+    virtual void setPedestal(double val) {stat.Set(val);}
 
   
+  
  private:
     MovingStat stat; /**< approximated moving average struct */
 

slsDetectorCalibration/singlePhotonDetector.h

@@ -150,6 +150,18 @@ class singlePhotonDetector {
        \param iy pixel y coordinate
     */
     double getPedestalRMS(int ix, int iy){if (ix>=0 && ix<nx && iy>=0 && iy<ny) return stat[iy][ix].getPedestalRMS();else return -1;};
+
+
+  /**
+       sets  pedestal
+       \param ix pixel x coordinate
+       \param iy pixel y coordinate
+       \param val value to set
+    */
+    virtual void setPedestal(int ix, int iy, double val){if (ix>=0 && ix<nx && iy>=0 && iy<ny) stat[iy][ix].setPedestal(val);};
+
+ 
+
   
 
     /** sets/gets number of rms threshold to detect photons

slsDetectorCalibration/slsReceiverData.h

@@ -226,8 +226,9 @@ public:
 		virtual void getChannelArray(double* data, char* buffer){};
 		virtual int* readNextFrameOnlyData(ifstream &filebin, int& fnum) {return NULL;};
 		virtual int* decodeData(int* datain) {return NULL;};
+virtual int getPacketNumber(int x, int y) {return 0;};
 
-private:
+protected:
 	const int nPackets; /**<number of UDP packets constituting one frame */
 	const int packetSize; /**< size of a udp packet */
 };