Changeset 14268

Timestamp:

07/16/12 17:45:10 (12 years ago)

Author:

neise

Message:

evolving

Location:

fact/tools/pyscripts/sandbox/dneise/fact_compress/c++

Files:

• Makefile (added)
• comp1.cpp (added)
• comp2.cpp (added)
• compare.cpp (modified) (5 diffs)
• entropy.cpp (added)
• factblowup.cpp (added)
• factcompress.cpp (added)
• fits.h (added)
• helper.cpp (added)
• izstream.h (added)
• readfits.cpp (modified) (10 diffs)
• test.cpp (added)
• test2.cpp (added)

fact/tools/pyscripts/sandbox/dneise/fact_compress/c++/compare.cpp

@@ -3 +3 @@
 #include <iostream>
 #include <fstream>
+#include <stdint.h>
+#include <stdio.h>
 using namespace std;
 
@@ -10 +12 @@
 char c1,c2;
 
-int main () {
+int main (int argc, char * argv[]) {
     
-    ifstream in1 ("a.fits", ios::in|ios::binary);
-    ifstream in2 ("bla.bin", ios::in|ios::binary);
+    ifstream in1 ( argv[1], ios::in|ios::binary);
+    ifstream in2 ( argv[2], ios::in|ios::binary);
     
     if (in1.is_open() && in2.is_open())
@@ -22 +24 @@
         end = in1.tellg();
         in1.seekg (0, ios::beg);
-        cout << "a.fits  size:" << end-begin << endl;
+        cout << argv[1] <<" size:" << end-begin << endl;
         
         begin = in2.tellg();
@@ -28 +30 @@
         end = in2.tellg();
         in2.seekg (0, ios::beg);
-        cout << "bla.bin size:" << end-begin << endl;
+        cout << argv[2] <<" size:" << end-begin << endl;
         
         while ( in1.good() && in2.good() )
@@ -37 +39 @@
             {
                 cout << "difference found @ adress:" << hex << in1.tellg() << "\t" << in2.tellg() << endl;
-                cout << "in1:" << hex << int(c1) << endl;
-                cout << "in2:" << hex << int(c2) << endl;
+                printf ("%30s \t: 0x%X \n", argv[1] ,uint8_t(c1) );
+                printf ("%30s \t: 0x%X \n", argv[2] ,uint8_t(c2) );
+                break;
             }
         }

fact/tools/pyscripts/sandbox/dneise/fact_compress/c++/readfits.cpp

@@ -1 @@
-
-// reading a complete binary file
 #include <iostream>
 #include <fstream>
 #include <vector>
+#include <string.h>
 
 // I will use the fits class by TB for reading the interesting data from the files
+
+#include "izstream.h"
+
 #define HAVE_ZLIB
-#include "fits"
+#include "fits.h"
 
 using namespace std;
@@ -15 +17 @@
 
 int main (int argc, char * argv[]) {
-    
+
+
     if (argc < 3)
     {
@@ -45 +48 @@
     fits * calib =new fits(calib_file_name);
     calib->PrintKeys();
-    calib->PrintColums();
-    offset_mV = new float[]
-    
-    // I need the offset calibration constants from the calibration files
-    // they are stored as floats at a known position inside the calibration file...
-    long position_of_calibration_constants = 0x1000;
-    // The calibration constants are stored in units of pseudo-mV. 
-    // but I need them in ADC units
-    // I will first read offset_mV from the file, then multiply (or divide) 
-    // with the conversion factor 2000/4096.;
-    // then I will convert it to shorts.
-    // From that point on I will only use the shorts in *offset*, so I can
-    // free the memory for *offset_mV* already.
+    calib->PrintColumns();
+
     int size_of_offset = 1440*1024;
-    int size_of_offset_memblock = 1440*1024*sizeof(float);
     float * offset_mV = new float[size_of_offset];
     short * offset = new short[size_of_offset];
-    char * memblock = new char[size_of_offset_memblock];
-    
-    ifstream calib (calib_file_name, ios::in|ios::binary);
-    if ( !calib.is_open() )
-    {
-        cerr << "Could not open Calibration File:" << calib_file_name << ".. ABORT." << endl;
-        return 1;
-    }
-    else // file was opened, I can go on...
-    {
-        calib.seekg(position_of_calibration_constants, ios::beg);
-        calib.read(memblock, size_of_offset_memblock);
-        offset_mV = (float*)memblock;
-        for (int i=0; i<size_of_offset; i++)
-        {
-            // -0.5 is for rounding correctly negative integers.
-            // in all cases where it worked, the offset should be negative for FACT.
-            offset[i] = short(offset_mV / 2000. * 4096 - 0.5);
-        }
-    }
+    calib->SetPtrAddress("BaselineMean",offset_mV, size_of_offset);
+
+    calib->GetNextRow();
+    for (int i =0 ; i<size_of_offset; i++)
+    {
+        offset[i] = short(offset_mV[i] / 2000. * 4096 - 0.5);
+    }
+    cout << endl;
     delete[] offset_mV;
-    delete[] memblock;
-    calib.close();
+    delete calib;
+    calib = NULL;
     //=========================================================================
     // END OF                CALIBRATION CONSTANTS
@@ -90 +69 @@
     
     
-    ifstream data (data_file_name, ios::in|ios::binary);
+    ifstream datafile (data_file_name, ios::in|ios::binary);
     ofstream out (out_file_name, ios::out|ios::binary|ios::trunc);
-    if (data.is_open() && out.is_open())
+    if (datafile.is_open() && out.is_open())
     {
         // create our own header
@@ -101 +80 @@
         const int ascii_header_size = 0x2d00;
         char * memblock = new char [ascii_header_size];
-        data.read(memblock, ascii_header_size);
+        datafile.read(memblock, ascii_header_size);
         out.write(memblock, ascii_header_size);
         delete[] memblock;
         
         for ( int event_id = 0 ; event_id < 1000; event_id++)
-        //while ( data.good() )
+        //while ( datafile.good() )
         {
             // copy binary header to new file
             const int bin_header_size = 3390;
             char * memblock = new char [bin_header_size];
-            data.read(memblock, bin_header_size);
+            datafile.read(memblock, bin_header_size);
             out.write(memblock, bin_header_size);
             delete[] memblock;
@@ -125 +104 @@
                 unsigned char * sizes = new unsigned char [diff_size];
                 
-                data.read(memblock, data_size*sizeof(short) );
+                datafile.read(memblock, data_size*sizeof(short) );
                 
                 for ( int i = 0; i<diff_size; i++)
@@ -195 +174 @@
                         for (int j = 0; j<group_sizes[i]; j++)
                         {
-                            out.write( (short*)&(diffs[diff_index++]), 2);
+                            out.write( (char*)&(diffs[diff_index++]), 2);
                         }
                     }
@@ -208 +187 @@
         }
         cout << "finished with 1000 events." << endl;
-        long after_address = data.tellg();
-        data.seekg (0, ios::end);
-        long end = data.tellg();
-        data.seekg (after_address, ios::beg);
+        long after_address = datafile.tellg();
+        datafile.seekg (0, ios::end);
+        long end = datafile.tellg();
+        datafile.seekg (after_address, ios::beg);
         
         cout << "between last event and end:" << end - after_address << endl;
@@ -217 +196 @@
         const int rest_size = end-after_address;
         char * memblock2 = new char [rest_size];
-        data.read(memblock2, rest_size);
+        datafile.read(memblock2, rest_size);
         cout << "first char in memblock: " << int(memblock2[0]) << endl;
         char lastchar = memblock2[0];
@@ -233 +212 @@
         
         
-        data.close();
+        datafile.close();
         out.close();
   } //end of if file open