--- quicklook/dataToXML/PhysEndRunToXML.cpp	2006/06/12 06:07:08	1.2
+++ quicklook/dataToXML/PhysEndRunToXML.cpp	2014/01/17 15:10:32	1.4
@@ -22,7 +22,8 @@
 #include <PscuHeader.h>
 #include <EventHeader.h>
 #include <fstream>
-
+#include <cstdlib>
+#include <sys/stat.h>
 #include <TFile.h>
 #include <TObjString.h>
 #include <TString.h>
@@ -30,7 +31,7 @@
 
 void PhysEndRunToXML(TString base, TString outDirectory = "", TString xslPath = ""){
     
-  Int_t    	tmpSize;
+  //  Int_t    	tmpSize;
   ofstream 	outputFile;
   stringstream 	oss;
   
@@ -96,10 +97,10 @@
 	  outputFile << "\t\t\t\t<HK1_ITEM>"      << (int)cer.CALO_HK1[k]           << "</HK1_ITEM>\n";
 	}
 	outputFile << "\t\t\t</HK1>\n";
-	outputFile << "\t\t\t<BOARD_ID_REG>"      << (int)cer.CALO_BOARD_ID_REG     << "</BOARD_ID_REG>\n";
-	outputFile << "\t\t\t<BOARD_ST_REG>"      << (int)cer.CALO_BOARD_STATUS_REG << "</BOARD_ST_REG>\n";
 	outputFile << "\t\t\t<CALO_REG>\n";
 	for (int k = 0; k < 7; k++){
+	  outputFile << "\t\t\t\t<CALO_REG_ITEM>"      << (short)cer.CALO_BOARD_ID_REG[k]     << "</CALO_REG_ITEM>\n";
+	  outputFile << "\t\t\t\t<CALO_REG_ITEM>"      << (short)cer.CALO_BOARD_STATUS_REG[k] << "</CALO_REG_ITEM>\n";
 	  outputFile << "\t\t\t\t<CALO_REG_ITEM>" << (int)cer.CALO_REG[k]           << "</CALO_REG_ITEM>\n";
 	}
 	outputFile << "\t\t\t</CALO_REG>\n";
@@ -109,18 +110,12 @@
 
       outputFile << "\t<TBENDRUN>\n";
       ter = pere->TB_ENDRUN;
-      outputFile << "\t\t<ALARM_MASK>"   << (int)ter.TB_ALARM_MASK   << "</ALARM_MASK>\n";
-      outputFile << "\t\t<PMT_MASK_S3>"  << (int)ter.TB_PMT_MASK_S3  << "</PMT_MASK_S3>\n";
-      outputFile << "\t\t<PMT_MASK_S2>"  << (int)ter.TB_PMT_MASK_S2  << "</PMT_MASK_S2>\n";
-      outputFile << "\t\t<PMT_MASK_S12>" << (int)ter.TB_PMT_MASK_S12 << "</PMT_MASK_S12>\n";
-      outputFile << "\t\t<PMT_MASK_S11>" << (int)ter.TB_PMT_MASK_S11 << "</PMT_MASK_S11>\n";
-      outputFile << "\t\t<S4_MASK>"      << (int)ter.TB_S4_MASK      << "</S4_MASK>\n";
-      outputFile << "\t\t<CALO_MASK>"    << (int)ter.TB_CALO_MASK    << "</CALO_MASK>\n";
-      outputFile << "\t\t<BUSY_MASK>"    << (int)ter.TB_BUSY_MASK    << "</BUSY_MASK>\n";
-      outputFile << "\t\t<CALIB_FLAG>"   << (int)ter.TB_CALIB_FLAG   << "</CALIB_FLAG>\n";
-      outputFile << "\t\t<S4_TRIG>"      << (int)ter.TB_S4_TRIG      << "</S4_TRIG>\n";
-      outputFile << "\t\t<CALO_TRIG>"    << (int)ter.TB_CALO_TRIG    << "</CALO_TRIG>\n";
-      outputFile << "\t\t<TOF_TRIG>"     << (int)ter.TB_TOF_TRIG     << "</TOF_TRIG>\n";
+      outputFile << "\t\t<ALARM_MASK>"   << (UInt_t)ter.TB_ALARM_MASK   << "</ALARM_MASK>\n";
+      outputFile << "\t\t<PMT_MASK_S3S2S12>"  << (UInt_t)ter.TB_PMT_MASK_S3S2S12  << "</PMT_MASK_S3S2S12>\n";
+      outputFile << "\t\t<PMT_MASK_S11CRC>"  << (UInt_t)ter.TB_PMT_MASK_S11CRC  << "</PMT_MASK_S11CRC>\n";
+      outputFile << "\t\t<PMT_MASK_S4CAL>" << (UInt_t)ter.TB_S4_CAL_MASK << "</PMT_MASK_S4CAL>\n";
+      outputFile << "\t\t<BUSY_MASK>"    << (UInt_t)ter.TB_BUSY_MASK    << "</BUSY_MASK>\n";
+      outputFile << "\t\t<TRIG_CONF>"   << (UInt_t)ter.TB_TRIG_CONF   << "</TRIG_CONF>\n";
       outputFile << "\t</TBENDRUN>\n";
             
       outputFile << "</PHYSER_EVENT>\n";	
@@ -149,26 +144,27 @@
 
   for (int i = 2; i < argc; i++){
     if (!strcmp(argv[i], "-outDir")){
-        if (++i >= argc){
-            printf( "-outDir needs arguments. \n");
-            printf( "Try '--help' for more information. \n");
-            exit(1);
-        } else {
-            outDir = argv[i];
-            continue;
-        }
+      if (++i >= argc){
+        printf( "-outDir needs arguments. \n");
+        printf( "Try '--help' for more information. \n");
+        exit(1);
+      } else {
+        outDir = argv[i];
+        continue;
+      }
     }
-
-    if (!strcmp(argv[i], "-xslPath")) 
-    	if (++i >= argc){
-            printf( "-xslPath needs arguments. \n");
-            printf( "Try '--help' for more information. \n");
-            exit(1);
-        } else {
-        	xslPath = argv[i];
-        	continue;
-        }
+    
+    if (!strcmp(argv[i], "-xslPath")){
+      if (++i >= argc){
+        printf( "-xslPath needs arguments. \n");
+        printf( "Try '--help' for more information. \n");
+        exit(1);
+      } else {
+        xslPath = argv[i];
+        continue;
+      }
     }
+  }
 	PhysEndRunToXML(argv[1], outDir, xslPath);
 }