slsDetectorSoftware & eiger server: fixed coordinates in 2 d, but switch to row (x), col(y); numdetx and numdety sent to all receivers now, likely bug fix virtual file linked in master for 1 mod jungfrau; xccoord and y coord calculated at setdetector pos and given to listener

slsReceiverSoftware/src/DataProcessor.cpp

@@ -47,7 +47,6 @@ DataProcessor::DataProcessor(int ind, detectorType dtype, Fifo*& f,
 		streamingTimerInMs(timer),
 		currentFreqCount(0),
 		tempBuffer(0),
-		xcoordin1D(0),
 		activated(act),
 		deactivatedPaddingEnable(depaden),
 		acquisitionStartedFlag(false),
@@ -224,8 +223,6 @@ void DataProcessor::SetupFileWriter(bool fwe, int* nd, uint32_t* maxf,
 	fileWriteEnable = fwe;
 	if (g)
 		generalData = g;
-	// fix xcoord as detector is not providing it right now
-	xcoordin1D =  ((*dindex) * (*nunits)) + index;
 
 
 	if (file) {
@@ -366,15 +363,6 @@ void DataProcessor::ProcessAnImage(char* buf) {
 		InsertGapPixels(buf + FIFO_HEADER_NUMBYTES + sizeof(sls_receiver_header),
 				*dynamicRange);
 
-	// x coord is 0 for detector in pos [0,0,0]
-	if (xcoordin1D) {
-		// do nothing as detector has correctly send them
-		if (header.xCoord || header.yCoord || header.zCoord)
-			;
-		// detector has send all 0's when there should have been a value greater than 0 in some dimension
-		else
-			header.xCoord = xcoordin1D;
-	}
 
 	// deactivated and padding enabled
 	if ((!(*activated) && *deactivatedPaddingEnable) ||
@@ -402,10 +390,11 @@ void DataProcessor::ProcessAnImage(char* buf) {
         (*((uint32_t*)buf)) =  revsize;
     }
 
+
 	// write to file
 	if (file)
 		file->WriteToFile(buf + FIFO_HEADER_NUMBYTES,
-				sizeof(sls_receiver_header) + (uint32_t)(*((uint32_t*)buf)),
+				sizeof(sls_receiver_header) + (uint32_t)(*((uint32_t*)buf)), //+ size of data (resizable from previous call back
 				fnum-firstMeasurementIndex, nump);
 
 

slsReceiverSoftware/src/HDF5File.cpp

@@ -170,7 +170,7 @@ void HDF5File::CloseCurrentFile() {
 	pthread_mutex_lock(&Mutex);
 	HDF5FileStatic::CloseDataFile(index, filefd);
 	pthread_mutex_unlock(&Mutex);
-	for (int i = 0; i < dataset_para.size(); ++i)
+	for (unsigned int i = 0; i < dataset_para.size(); ++i)
 		delete dataset_para[i];
 	dataset_para.clear();
 	if(dataspace_para) {delete dataspace_para;dataspace_para=0;}
@@ -190,7 +190,7 @@ void HDF5File::CloseAllFiles() {
 	}
 	pthread_mutex_unlock(&Mutex);
 
-	for (int i = 0; i < dataset_para.size(); ++i)
+	for (unsigned int i = 0; i < dataset_para.size(); ++i)
 		delete dataset_para[i];
 	dataset_para.clear();
 	if(dataspace_para) delete dataspace_para;
@@ -201,6 +201,7 @@ void HDF5File::CloseAllFiles() {
 
 
 int HDF5File::WriteToFile(char* buffer, int buffersize, uint64_t fnum, uint32_t nump) {
+
 	// check if maxframesperfile = 0 for infinite
 	if ((*maxFramesPerFile) && (numFramesInFile >= (*maxFramesPerFile))) {
 		CloseCurrentFile();
@@ -228,12 +229,12 @@ int HDF5File::WriteToFile(char* buffer, int buffersize, uint64_t fnum, uint32_t
 			((*maxFramesPerFile == 0) ? fnum : fnum%(*maxFramesPerFile)),
 			nPixelsY, ((*dynamicRange==4) ? (nPixelsX/2) : nPixelsX),
 			dataspace, dataset, datatype) == OK) {
-		sls_receiver_header* header = (sls_receiver_header*) (buffer);
-		/*header->xCoord = ((*detIndex) * (*numUnitsPerDetector) + index); */
+
 		if (HDF5FileStatic::WriteParameterDatasets(index, dataspace_para,
 				// infinite then no need for %maxframesperfile
 				((*maxFramesPerFile == 0) ? fnum : fnum%(*maxFramesPerFile)),
-				dataset_para, header, parameterDataTypes) == OK) {
+				dataset_para, (sls_receiver_header*) (buffer),
+				parameterDataTypes) == OK) {
 			pthread_mutex_unlock(&Mutex);
 			return OK;
 		}
@@ -277,43 +278,51 @@ void HDF5File::EndofAcquisition(bool anyPacketsCaught, uint64_t numf) {
 	//not created before
 	if (!virtualfd && anyPacketsCaught) {
 
-		//only one file and one sub image (link current file in master)
-		if (((numFilesinAcquisition == 1) && (numDetY*numDetX) == 1)) {
-			//dataset name
-			ostringstream osfn;
-			osfn << "/data";
-			if ((*numImages > 1)) osfn << "_f" << setfill('0') << setw(12) << 0;
-			string dsetname = osfn.str();
-			pthread_mutex_lock(&Mutex);
-			HDF5FileStatic::LinkVirtualInMaster(masterFileName, currentFileName,
-					dsetname, parameterNames);
-			pthread_mutex_unlock(&Mutex);
-		}
+		// called only by the one maser receiver
+		if (master && (*detIndex==0)) {
 
-		//create virutal file
-		else
-			CreateVirtualFile(numf);
+			//only one file and one sub image (link current file in master)
+			if (((numFilesinAcquisition == 1) && (numDetY*numDetX) == 1)) {
+				LinkVirtualFileinMasterFile();
+			}
+			//create virutal file
+			else{
+				CreateVirtualFile(numf);}
+		}
 	}
 	numFilesinAcquisition = 0;
 }
 
 
+// called only by the one maser receiver
 int HDF5File::CreateVirtualFile(uint64_t numf) {
-	if (master && (*detIndex==0)) {
-		pthread_mutex_lock(&Mutex);
-		int ret = HDF5FileStatic::CreateVirtualDataFile(
-				virtualfd, masterFileName,
-				filePath, fileNamePrefix, *fileIndex, (*numImages > 1),
-				*detIndex, *numUnitsPerDetector,
-				// infinite images in 1 file, then maxfrperfile = numf
-				((*maxFramesPerFile == 0) ? numf+1 : *maxFramesPerFile),
-				numf+1,
-				"data",	datatype,
-				numDetY, numDetX, nPixelsY, ((*dynamicRange==4) ? (nPixelsX/2) : nPixelsX),
-				HDF5_WRITER_VERSION,
-				parameterNames, parameterDataTypes);
-		pthread_mutex_unlock(&Mutex);
-		return ret;
-	}
-	return OK;
+	pthread_mutex_lock(&Mutex);
+	int ret = HDF5FileStatic::CreateVirtualDataFile(
+			virtualfd, masterFileName,
+			filePath, fileNamePrefix, *fileIndex, (*numImages > 1),
+			*detIndex, *numUnitsPerDetector,
+			// infinite images in 1 file, then maxfrperfile = numf
+			((*maxFramesPerFile == 0) ? numf+1 : *maxFramesPerFile),
+			numf+1,
+			"data",	datatype,
+			numDetY, numDetX, nPixelsY, ((*dynamicRange==4) ? (nPixelsX/2) : nPixelsX),
+			HDF5_WRITER_VERSION,
+			parameterNames, parameterDataTypes);
+	pthread_mutex_unlock(&Mutex);
+	return ret;
+}
+
+// called only by the one maser receiver
+int HDF5File::LinkVirtualFileinMasterFile() {
+	//dataset name
+	ostringstream osfn;
+	osfn << "/data";
+	if ((*numImages > 1)) osfn << "_f" << setfill('0') << setw(12) << 0;
+	string dsetname = osfn.str();
+
+	pthread_mutex_lock(&Mutex);
+	int ret = HDF5FileStatic::LinkVirtualInMaster(masterFileName, currentFileName,
+			dsetname, parameterNames);
+	pthread_mutex_unlock(&Mutex);
+	return ret;
 }

slsReceiverSoftware/src/Listener.cpp

@@ -40,6 +40,8 @@ Listener::Listener(int ind, detectorType dtype, Fifo*& f, runStatus* s,
 		frameDiscardMode(fdp),
 		activated(act),
 		deactivatedPaddingEnable(depaden),
+		xcoord(0),
+		ycoord(0),
 		acquisitionStartedFlag(false),
 		measurementStartedFlag(false),
 		firstAcquisitionIndex(0),
@@ -292,6 +294,10 @@ int Listener::CreateDummySocketForUDPSocketBufferSize(uint32_t s) {
     return OK;
 }
 
+void Listener::SetHardCodedCoords(uint16_t x, uint16_t y) {
+	xcoord = x;
+	ycoord = y;
+}
 
 void Listener::ThreadExecution() {
 	char* buffer;
@@ -392,14 +398,21 @@ uint32_t Listener::ListenToAnImage(char* buf) {
 	new_header = (sls_receiver_header*) (buf + FIFO_HEADER_NUMBYTES);
 
 	// deactivated (eiger)
-	if (!(*activated)) {cprintf(RED,"deactivated receiver\n");
+	if (!(*activated)) {
 		// no padding
-		if (!(*deactivatedPaddingEnable)) {
-			return 0;}
+		if (!(*deactivatedPaddingEnable))
+			return 0;
 		// padding without setting bitmask (all missing packets padded in dataProcessor)
 		if (currentFrameIndex >= *numImages)
 			return 0;
-		new_header->detHeader.frameNumber = currentFrameIndex+1; //(eiger)
+
+		//(eiger) first fnum starts at 1
+		if (!currentFrameIndex) {
+			++currentFrameIndex;
+		}
+		new_header->detHeader.frameNumber = currentFrameIndex;
+		new_header->detHeader.xCoord = xcoord;
+		new_header->detHeader.yCoord = ycoord;
 		new_header->detHeader.detType = (uint8_t) generalData->myDetectorType;
 		new_header->detHeader.version = (uint8_t) SLS_DETECTOR_HEADER_VERSION;
 		return generalData->imageSize;
@@ -439,6 +452,10 @@ uint32_t Listener::ListenToAnImage(char* buf) {
 				break;
 			}
 			new_header->detHeader.packetNumber = numpackets;
+			if(isHeaderEmpty) {
+				new_header->detHeader.xCoord = xcoord;
+				new_header->detHeader.yCoord = ycoord;
+			}
 			return generalData->imageSize;
 		}
 
@@ -476,6 +493,8 @@ uint32_t Listener::ListenToAnImage(char* buf) {
 			// -------------------old header ------------------------------------------------------------------------------
 			else {
 				new_header->detHeader.frameNumber = fnum;
+				new_header->detHeader.xCoord = xcoord;
+				new_header->detHeader.yCoord = ycoord;
 				new_header->detHeader.detType = (uint8_t) generalData->myDetectorType;
 				new_header->detHeader.version = (uint8_t) SLS_DETECTOR_HEADER_VERSION;
 			}
@@ -510,6 +529,10 @@ uint32_t Listener::ListenToAnImage(char* buf) {
 				break;
 			}
 			new_header->detHeader.packetNumber = numpackets; 	//number of packets caught
+			if(isHeaderEmpty) {
+				new_header->detHeader.xCoord = xcoord;
+				new_header->detHeader.yCoord = ycoord;
+			}
 			return generalData->imageSize;	//empty packet now, but not empty image
 		}
 
@@ -565,6 +588,10 @@ uint32_t Listener::ListenToAnImage(char* buf) {
 				break;
 			}
 			new_header->detHeader.packetNumber = numpackets; 	//number of packets caught
+			if(isHeaderEmpty) {
+				new_header->detHeader.xCoord = xcoord;
+				new_header->detHeader.yCoord = ycoord;
+			}
 			return generalData->imageSize;
 		}
 
@@ -599,6 +626,8 @@ uint32_t Listener::ListenToAnImage(char* buf) {
 			// -------------------old header ------------------------------------------------------------------------------
 			else {
 				new_header->detHeader.frameNumber = fnum;
+				new_header->detHeader.xCoord = xcoord;
+				new_header->detHeader.yCoord = ycoord;
 				new_header->detHeader.detType = (uint8_t) generalData->myDetectorType;
 				new_header->detHeader.version = (uint8_t) SLS_DETECTOR_HEADER_VERSION;
 			}

slsReceiverSoftware/src/UDPStandardImplementation.cpp

@@ -424,6 +424,18 @@ void UDPStandardImplementation::setDetectorPositionId(const int i){
 				&detID,	&numThreads, &numberOfFrames, &dynamicRange, &udpPortNum[i],
 				generalData);
 	}
+
+	for (unsigned int i = 0; i < listener.size(); ++i) {
+		uint16_t x = 0, y = 0;
+		if (myDetectorType == EIGER || myDetectorType == JUNGFRAU) {
+			x = detID % numDet[1]; // row
+			y = (detID / numDet[1])  * ((myDetectorType == EIGER) ? 2 : 1) + i; // col for horiz. udp ports
+		}
+		// calculate x in 1d
+		else
+			x = detID * numThreads + i;
+		listener[i]->SetHardCodedCoords(x,y);
+	}
 }