ry laeuft

src/rssm.cpp

@@ -141,6 +141,7 @@ void RssmRawFile::RdRawYam( FILE *F_in )
         val = y.getscalar( "x-value" );
         if( mystd::any2dbl( val, &num ) )
             throw string( "E-Hist: invalid x-value " ) + val;
+        printf( "E: %f\n", num );
         for( int i=0; i<4; ++i )
             rawdata[i].push_back( num );
         for( int i=0; i<4; ++i ){
@@ -159,6 +160,42 @@ void RssmRawFile::RdRawYam( FILE *F_in )
             for( int ii=0; ii<numvec.size(); ++ii )
                 rawdata[i].push_back( numvec[ii] );
         }
+        y.checktype( YAML_SEQUENCE_END_EVENT, "E-Hist entry" );
+    }
+    y.done();
+
+    y.checkvalue( "ChopperHistograms" );
+    y.checktype( YAML_SEQUENCE_START_EVENT, "C-Hist: no seq\n" );
+    while( true ){
+        y.next();
+        if( y.event.type == YAML_SEQUENCE_END_EVENT )
+            break;
+        if( y.event.type != YAML_SEQUENCE_START_EVENT )
+            throw string ( "C-Hist: seq: no seq" );
+        y.done();
+        val = y.getscalar( "x-value" );
+        if( mystd::any2dbl( val, &num ) )
+            throw string( "C-Hist: invalid x-value " ) + val;
+        printf( "p: %f\n", num );
+        for( int i=4; i<6; ++i )
+            rawdata[i].push_back( num );
+        for( int i=4; i<6; ++i ){
+            val = y.getscalar( "cnts line" );
+            if( mystd::str2vec( val, &numvec ) )
+                throw string( "cnts line extraction failed" );
+            if( numvec.size()!=ndet )
+                throw string( "hist: ndet incompatibility" );
+            for( int ii=0; ii<numvec.size(); ++ii )
+                rawdata[i].push_back( numvec[ii] );
+        }
+        for( int i=4; i<6; ++i ){
+            val = y.getscalar( "time line" );
+            if( mystd::str2vec( val, &numvec ) )
+                throw string( "time line extraction failed" );
+            for( int ii=0; ii<numvec.size(); ++ii )
+                rawdata[i].push_back( numvec[ii] );
+        }
+        y.checktype( YAML_SEQUENCE_END_EVENT, "C-Hist entry" );
     }
     y.done();