sample and error counts added to txt file #1

apollo-lhc · Jun 24, 2021 · ac0bfe6 · ac0bfe6
1 parent 3b80cc6
commit ac0bfe6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,5 @@ env.sh
 doc/html
 bin
 *.DS_Store
+python/test.png
+python/test.txt
diff --git a/include/ApolloSM/eyescan.hh b/include/ApolloSM/eyescan.hh
@@ -7,6 +7,8 @@ struct eyescanCoords {
   int voltage;
   double phase;
   double BER;
+  int sample;
+  int errors;
   uint8_t voltageReg;
   uint16_t phaseReg;
 };

diff --git a/src/ApolloSM/ApolloSM_eyescan.cc b/src/ApolloSM/ApolloSM_eyescan.cc
@@ -603,10 +603,11 @@ std::vector<eyescanCoords> ApolloSM::EyeScan(std::string baseNode, std::string l
       esCoords[coordsIndex].voltage = voltage; 
       esCoords[coordsIndex].phase = phase;
       //      printf("%d %d\n", voltage, phaseInt);
-
-      printf("Start pixel scan\n");
+      //Get BER for this point
       esCoords[coordsIndex].BER = SingleEyeScan(baseNode, lpmNode, maxPrescale);
-      printf("Pixel scan done\n");
+      //sample count and error count for this point
+      esCoords[coordsIndex].sample = RegReadRegister(baseNode + "SAMPLE_COUNT");
+      esCoords[coordsIndex].error = RegReadRegister(baseNode + "ERROR_COUNT");
       // Vert sign mask is 0x80 so we need to shift right by 7
       esCoords[coordsIndex].voltageReg = RegReadRegister(baseNode + "VERT_OFFSET_MAG") | (RegReadRegister(baseNode + "VERT_OFFSET_SIGN") << 7); 
       esCoords[coordsIndex].phaseReg = RegReadRegister(baseNode + "HORZ_OFFSET_MAG")&0x0FFF;

diff --git a/src/ApolloSM_device/ApolloSM_device.cc b/src/ApolloSM_device/ApolloSM_device.cc
@@ -589,6 +589,8 @@ CommandReturn::status ApolloSMDevice::EyeScan(std::vector<std::string> strArg, s
     fprintf(dataFile, "%.9f ", esCoords[i].phase);
     fprintf(dataFile, "%d ", esCoords[i].voltage);
     fprintf(dataFile, "%f ", esCoords[i].BER);
+    fprintf(dataFile, "%d ", esCoords[i].sample);
+    fprintf(dataFile, "%d ", esCoords[i].error);
     fprintf(dataFile, "%x ", esCoords[i].voltageReg & 0xFF);
     fprintf(dataFile, "%x\n", esCoords[i].phaseReg & 0xFFF);
   }