Changeset 263 in Idarraga

Timestamp:

Mar 1, 2012, 3:07:18 PM (12 years ago)

Author:

idarraga

Message:

 

Location:

mpxdataconverter

Files:

• Makefile (modified) (3 diffs)
• allpix_dm.cc (modified) (3 diffs)
• binary_multiframe.cpp (added)

mpxdataconverter/Makefile

@@ -19 +19 @@
 PROGNAME=mpxdataconverter
 
-all:    $(PROGNAME) raw_to_pixeldm
+all:    $(PROGNAME) raw_to_pixeldm binary_multiframe
         @echo "[DONE]"
 ifeq ($(DO_FLAG),FALSE)
@@ -48 +48 @@
         g++ -o $@ raw_to_pixeldm.o allpix_dm.o MediPixWriteToEntuple.o SelDict.o $(GLOBAL_CFLAGS) $(INCLUDE) ${LIBS}
 
+binary_multiframe:      msg3 SelDict.o allpix_dm.o MediPixWriteToEntuple.o binary_multiframe.cpp 
+        g++ $(GLOBAL_CFLAGS) $(INCLUDE) -c binary_multiframe.cpp
+        g++ -o $@ binary_multiframe.o allpix_dm.o MediPixWriteToEntuple.o SelDict.o $(GLOBAL_CFLAGS) $(INCLUDE) ${LIBS}
+
 msg2:   
         @echo "----------------------------------------------------"
@@ -54 +58 @@
         @echo "                                    idarraga@cern.ch"
         @echo "----------------------------------------------------"    
+
+msg3:   
+        @echo "-------------------------------------------------------"
+        @echo " Building converter: Pixelman bin-multiframe to MAFalda"
+        @echo "                                    John Idarraga, 2011"
+        @echo "                                       idarraga@cern.ch"
+        @echo "-------------------------------------------------------" 
+
         
 #########################################

mpxdataconverter/allpix_dm.cc

@@ -323 +323 @@
                         // Now extract the format
                         infoS = NEW_STRING_TYPEI6_XYC;
-                        if(found = tempS.find(infoS) != std::string::npos) {
+                        if ( (found = tempS.find(infoS)) != std::string::npos) {
                                 return FSAVE_ASCII | FSAVE_I16 | FSAVE_SPARSEXY;
                         }
@@ -335 +335 @@
 }
 
-Int_t FramesHandler::IdentifyTypeOfInput(TString fullDSCFileName, Int_t & width, Int_t & height){
+Int_t FramesHandler::IdentifyTypeOfInput(TString fullDSCFileName, Int_t & /*width*/, Int_t & /*height*/){
 
         fstream filestr;
@@ -623 +623 @@
                 }
         }
-        else if(frameType == FSAVE_BINARY) {
+        else if (frameType == FSAVE_BINARY) {
 
                 typeS = TYPE_XYC_BIN_STRING;