Changeset 292 in Idarraga

Timestamp:

Apr 30, 2012, 3:33:30 AM (12 years ago)

Author:

idarraga

Message:

 

Location:

mpxdataconverter

Files:

• MediPixROOTConverter.cpp (modified) (2 diffs)
• allpix_dm.cc (modified) (1 diff)
• listHandler.cpp (modified) (2 diffs)

mpxdataconverter/MediPixROOTConverter.cpp

@@ -77 +77 @@
 */
 
-  if((listOfFiles.size() != listOfDSCFiles.size()) && listOfDSCFiles.size() != 0)
-    {
+  if( listOfFiles.size() != listOfDSCFiles.size() ) {
       std::cout << "[ERROR] you have a different amount of dsc and frame files." << std::endl;
       std::cout << "        You probably have an extra file that doesn't correspond" << std::endl;
@@ -84 +83 @@
       exit(1);
     }
-
 
   Long_t filesItr;

mpxdataconverter/allpix_dm.cc

@@ -638 +638 @@
                 }
         }
-        else if (frameType == FSAVE_BINARY) {
+        //////////////////////////////////////////////////////////////////////////
+        // Binaries
+        //////////////////////////////////////////////////////////////////////////
+        else if (
+                        ( frameType == (FSAVE_BINARY | FSAVE_I16 | FSAVE_SPARSEXY) ) ||
+                        ( frameType == (FSAVE_BINARY | FSAVE_U32 | FSAVE_SPARSEXY) )
+                        )
+        /*
+        {
+
+                typeS = TYPE_XYC_BIN_STRING;
+                std::cout << "[INFO] opening: " << fullFileName << "  --|and|-->  " << fullDSCFileName
+                                << " --> " << typeS << "(" << frameType << ")"<< std::endl;
+
+        } else if (frameType == FSAVE_BINARY)
+        */
+        { // explicit with B0000001 string
 
                 typeS = TYPE_XYC_BIN_STRING;

mpxdataconverter/listHandler.cpp

@@ -32 +32 @@
                 // second possible name
                 tempName2 = ((TString)(*itFrames));
+                int size = tempName2.Sizeof();
+                bool marktobreak = false;
+                for(int i = size-1 ; i >= 0 ; i--) {
+                        if(tempName2[i] == '.'){
+                                marktobreak = true;
+                        }
+                        // remove first
+                        tempName2.Remove(i);
+                        // then break if necessary
+                        if(marktobreak) break;
+                }
+                tempName2+=".dsc";
+
+                /*
                 if(((TString)(*itFrames)).Contains(".txt")) {
                         tempName2.Remove(TString::kTrailing, 't');
@@ -39 +53 @@
                 }
                 tempName2+=".dsc";
+
+                // third possible name
+                tempName2 = ((TString)(*itFrames));
+                if(((TString)(*itFrames)).Contains(".dat")) {
+                        tempName2.Remove(TString::kTrailing, 't');
+                        tempName2.Remove(TString::kTrailing, 'x');
+                        tempName2.Remove(TString::kTrailing, 't');
+                        tempName2.Remove(TString::kTrailing, '.');
+                }
+                tempName2+=".dsc";
+                 */
 
                 /* look for the corresponding .dsc file