Skip to content
Snippets Groups Projects
rssm.cpp 19.2 KiB
Newer Older
  • Learn to ignore specific revisions
  • //**************************************************************************//
    
    //* FRIDA: flexible rapid interactive data analysis                        *//
    
    //* rssm.cpp: read SPHERES raw data                                        *//
    //* (C) Joachim Wuttke 1990-, v2(C++) 2001-                                *//
    
    //* http://www.messen-und-deuten.de/frida                                  *//
    
    //**************************************************************************//
    
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
    #include <stdlib.h>
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
    #include <iostream>
    
    #include <ask_simple_value.h>
    
    
    #include "mystd.h"
    #include "olf.h"
    #include "mem.h"
    
    #include "rssm.h"
    
    using namespace std;
    
    
    class CRawfileSpheres {
    
        void RdRawYam( ifstream& F_in );
    
        double daq_time_step;
        time_t measured_from;
        time_t measured_until;
        int    measured_at;
        double measured_during;
    
        vector<double> rawdata[6];
        vector<double> angles;
        int    maj_syntax, min_syntax, maj_outform, min_outform;
    };
    
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
    //! Read raw data file, store contents as class variables
    
    
    //void CRawfileSpheres::RdRawYam( FILE *F_in )
    void CRawfileSpheres::RdRawYam( ifstream& F_in )
    
    Wuttke, Joachim's avatar
    ry  
    Wuttke, Joachim committed
        string lin, key, val, bla, blub;
    
        CSpec sout;
    
    Wuttke, Joachim's avatar
    ry  
    Wuttke, Joachim committed
        vector<double> numvec;
    
        uint ndet;
    
    Wuttke, Joachim's avatar
    ry  
    Wuttke, Joachim committed
    
    
        maj_outform = 5;
        min_outform = 1;
    
    
        YAML::Parser parser(F_in);
        YAML::Node doc;
        parser.GetNextDocument(doc);
    
    
        // read Meta:
    
        if(!doc.FindValue("Meta"))
            throw string("no Meta" );
        try {
            YAML::CONTENT_TYPE Metatype = doc["Meta"].GetType();
            if ( Metatype != YAML::CT_MAP && doc["Meta"].size() > 0)
    
                throw string("DATA BUG: Meta is not a MAP" );
    
            if(!doc["Meta"].FindValue("format"))
    
                throw string("DATA BUG: no format in Meta" );
    
            doc["Meta"]["format"] >> val;
            if( strncmp( val.c_str(), "acq5.1 for yaml1", 16 ) )
    
                throw "UNEXPECTED DATA: format: " + val + " instead of acq5.1";
    
        } catch(YAML::ParserException& e) {
    
            throw string( "DATA BUG: failed to read Meta section" ) + e.what();
    
        // ignore History.
    
        // read Shortpar:
    
        if(!doc.FindValue("Shortpar"))
    
            throw string( "DATA BUG: no Shortpar" );
    
        for(YAML::Iterator it=doc["Shortpar"].begin();
        it!=doc["Shortpar"].end();++it) {
            it.first() >> key;
            it.second() >> val;
            if      ( key=="incremental" ){
    
                if      ( val=="true" )
                    incremental = true;
                else if ( val=="false" )
                    incremental = false;
                else
    
                    throw string( "DATA BUG: invalid value [" ) + val +
                        "] of 'incremental'";
    
    Wuttke, Joachim's avatar
    ry  
    Wuttke, Joachim committed
            } else if ( key=="measured_until" ){
    
                char date_string[24];
                sscanf( val.c_str(), "%24c", date_string );
                struct tm date_broken;
                strptime( date_string, "%F %A %H:%M:%S", &date_broken );
                measured_until = mktime( &date_broken );
    
    Wuttke, Joachim's avatar
    ry  
    Wuttke, Joachim committed
            } else if ( key=="ndet" ){
    
                if( !mystd::any2uint( val, &ndet ) )
                    throw string( "DATA BUG: invalid ndet" );
    
    Wuttke, Joachim's avatar
    ry  
    Wuttke, Joachim committed
            } else if ( key=="daq_time_step" ){
                mystd::string_extract_word( val, &bla, &blub );
                mystd::any2dbl( bla, &daq_time_step );
    
    Wuttke, Joachim's avatar
    ry  
    Wuttke, Joachim committed
        if( !daq_time_step )
    
            throw string( "DATA BUG: daq time step not found" );
    
        // ignore Longpar.
    
        // read Detectors:
    
        if(!doc.FindValue("Detectors"))
    
            throw string("DATA BUG: no Detectors" );
        if ( doc["Detectors"].GetType() != YAML::CT_SEQUENCE )
            throw string("DATA BUG: Detectors is not a SEQUENCE" );
        if( doc["Detectors"].size()!=ndet )
            throw string("DATA BUG: Detectors has not size ndet" );
        for (uint iDet = 0; iDet<ndet; iDet++) {
    
            if ( doc["Detectors"][iDet].GetType() != YAML::CT_MAP )
    
                throw string("DATA BUG: Detector ") + strg(iDet) + " is not a MAP";
    
            if( const YAML::Node *pName = 
            doc["Detectors"][iDet].FindValue("angle") ){
                *pName >> val;
                if( !mystd::any2dbl( val, &num ) ){
                    num = 0;
    
                    printf( "WARNING: invalid angle %s\n", 
    
                throw string( "DATA BUG: missing angle" );
    
    Wuttke, Joachim's avatar
    ry  
    Wuttke, Joachim committed
            angles.push_back( num );
    
        // read EnergyHistograms:
        if( !doc.FindValue("EnergyHistograms") )
            throw string("DATA BUG: no EnergyHistograms" );
        if ( doc["EnergyHistograms"].GetType() != YAML::CT_SEQUENCE )
            throw string("DATA BUG: EnergyHistograms is not a SEQUENCE" );
        uint nEne = doc["EnergyHistograms"].size();
        for ( uint iEne = 0; iEne<nEne; iEne++ ) {
    
            if ( doc["EnergyHistograms"][iEne].GetType() != YAML::CT_SEQUENCE )
    
                throw "DATA BUUG: EnergyHistogram " + strg(iEne) + 
                      " is not a SEQUENCE"; 
    
            doc["EnergyHistograms"][iEne][0] >> val;
    
            if( !mystd::any2dbl( val, &num ) )
    
    Wuttke, Joachim's avatar
    ry  
    Wuttke, Joachim committed
                throw string( "E-Hist: invalid x-value " ) + val;
            for( int i=0; i<4; ++i )
                rawdata[i].push_back( num );
            for( int i=0; i<4; ++i ){
    
                doc["EnergyHistograms"][iEne][i+1] >> val;// cnts line
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                if( !mystd::str2vec( val, &numvec ) )
    
                    throw string( "DATA BUG: cnts line extraction failed" );
    
    Wuttke, Joachim's avatar
    ry  
    Wuttke, Joachim committed
                if( numvec.size()!=ndet )
    
                    throw string( "DATA BUG: hist: ndet incompatibility" );
    
    Wuttke, Joachim's avatar
    ry  
    Wuttke, Joachim committed
                for( int ii=0; ii<numvec.size(); ++ii )
                    rawdata[i].push_back( numvec[ii] );
            }
            for( int i=0; i<4; ++i ){
    
                doc["EnergyHistograms"][iEne][i+1+4] >> val;// time line
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                if( !mystd::str2vec( val, &numvec ) )
    
                    throw string( "DATA BUG: time line extraction failed" );
    
    Wuttke, Joachim's avatar
    ry  
    Wuttke, Joachim committed
                for( int ii=0; ii<numvec.size(); ++ii )
                    rawdata[i].push_back( numvec[ii] );
            }
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
        }
    
        // read ChopperHistograms:
    
        if(!doc.FindValue("ChopperHistograms"))
            throw string("no ChopperHistograms" );
    
        if ( doc["ChopperHistograms"].GetType() != YAML::CT_SEQUENCE )
            throw string( "DATA BUG: ChopperHistograms is not a SEQUENCE" );
        uint nCho =  doc["ChopperHistograms"].size();
        for (uint iCho = 0; iCho<nCho; iCho++) {
    
            if ( doc["ChopperHistograms"][iCho].GetType() != YAML::CT_SEQUENCE )
    
                throw string( "DATA BUG: ChopperHistograms " ) + strg(iCho) +
                    " is not a SEQUENCE";         
    
            doc["ChopperHistograms"][iCho][0] >> val;
    
            if( !mystd::any2dbl( val, &num ) )
    
                throw string( "DATA BUG: C-Hist: invalid x-value " ) + val;
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
            for( int i=4; i<6; ++i )
                rawdata[i].push_back( num );
    
            for( int i=4; i<6; ++i ){                        // 2 cnts lines
                doc["ChopperHistograms"][iCho][i-4+1] >> val;//cnts line
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                if( !mystd::str2vec( val, &numvec ) )
    
                    throw string( "DATA BUG: cnts line extraction failed" );
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                if( numvec.size()!=ndet )
    
                    throw string( "DATA BUG: hist: ndet incompatibility" );
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                for( int ii=0; ii<numvec.size(); ++ii )
                    rawdata[i].push_back( numvec[ii] );
            }
    
            for( int i=4; i<6; ++i ){            // 2 time lines
                doc["ChopperHistograms"][iCho][i-4+1+2] >> val;//time line
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                if( !mystd::str2vec( val, &numvec ) )
    
                    throw string( "DATA BUG: time line extraction failed" );
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                for( int ii=0; ii<numvec.size(); ++ii )
                    rawdata[i].push_back( numvec[ii] );
            }
    
    void NRSSM::ReadSpec( int flag )
    
    
    // flag values (to be OR'ed):
    //    1 save also open
    //    2 save also chop histo
    //    4 save spectra also separately for both directions
    //    8 do not save regular spectrum
    
    {
        string file_f, name;
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
        file_f = wask("Read SPHERES data from file");
    
        CRawfileSpheres R;
    
        F_in.open (file_f.c_str(),fstream::in);
        if( !(F_in.is_open()) )
            throw "Cannot read " + file_f;
        R.RdRawYam( F_in );
    
    
        double tstep = R.daq_time_step;
        vector<double> *raw = R.rawdata;
        int ndet = R.angles.size();
    
        // *** set file headers ***
    
    
        int iolf;
        for( iolf=0; iolf<8; ++iolf ){
    
            olf[iolf] = POld( new COld );
            olf[iolf]->xco = iolf<4 ||iolf>5 ?
    
                CCoord( "E", "ueV" ) : CCoord( "phase", "deg" );
    
            olf[iolf]->yco = CCoord( "cts", "sec-1" );
            olf[iolf]->ZCo.push_back( CCoord( "det", "") );
    
        }
        mystd::fname_divide( file_f, 0, &name, 0 );
    
        olf[0]->name = name+"left";
        olf[1]->name = name+"right";
        olf[2]->name = name+"open_left";
        olf[3]->name = name+"open_right";
        olf[4]->name = name+"chop_elast";
        olf[5]->name = name+"chop_inela";
        olf[6]->name = name;
        olf[7]->name = name+"open";
    
        string doc = "ry" + (flag==0 ? "" : strg(flag+1)) + " " + file_f;
    
        olf[0]->lDoc.push_back( doc + " # refl, left halfspace" );
        olf[1]->lDoc.push_back( doc + " # refl, right halfspace" );
        olf[2]->lDoc.push_back( doc + " # open, left halfspace" );
        olf[3]->lDoc.push_back( doc + " # open, right halfspace" );
        olf[4]->lDoc.push_back( doc + " # elastic" );
        olf[5]->lDoc.push_back( doc + " # inelastic" );
        olf[6]->lDoc.push_back( doc + " # refl" );
        olf[7]->lDoc.push_back( doc + " # open" );
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
        for( iolf=0; iolf<8; ++iolf ){
            for( int j=0; j<ndet; ++j ){
                PSpec S( new CSpec );
                S->z.resize( 1 );
                S->z[0] = R.angles[j];
    
                olf[iolf]->V.push_back(S);
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
            }
    
        if( R.maj_outform<=2 ){ // old data format
    
            double x, tmeas, count;
            // transfer data from raw arrays:
            for( iolf=0; iolf<6; ++iolf ){
    
                for( int iraw=0; iraw<raw[iolf].size(); iraw+=(ndet+2) ){
    
                    x = raw[iolf][iraw];
                    tmeas = raw[iolf][iraw+ndet+1];
                    if( tmeas<1 ) continue;
                    for ( int j=0; j<ndet; ++j ){
                        count = raw[iolf][iraw+1+j];
    
                        olf[iolf]->VS(j)->push_xy( x, count/tmeas/tstep );
    
                    }
                }
            }
            // sum over halfspaces:
            for( int ichop=0; ichop<2; ++ichop ){
                int iolf0 = ichop*2;
                int iolf1 = ichop*2+1;
    
                int nline = raw[iolf0].size();
                if( raw[iolf1].size()!=nline )
                    throw string( "inconsistent raw array sizes" );
    
                for( int iraw=0; iraw<nline; iraw+=(ndet+2) ){
                    x = raw[iolf0][iraw];
                    tmeas = raw[iolf0][iraw+ndet+1]+raw[iolf1][iraw+ndet+1];
                    if( tmeas<1 ) continue;
                    for ( int j=0; j<ndet; ++j ){
                        count = raw[iolf0][iraw+1+j] + raw[iolf1][iraw+1+j];
    
                        olf[6+ichop]->VS(j)->push_xy( x, count/tmeas/tstep );
    
                    }
                }
            }
    
        } else { // as of 2008-03-03
            double x, tmeas, count;
            // transfer data from raw arrays:
            for( iolf=0; iolf<6; ++iolf ){
    
                for( int iraw=0; iraw<raw[iolf].size(); iraw+=(1+ndet*2) ){
    
                    x = raw[iolf][iraw];
                    for ( int j=0; j<ndet; ++j ){
                        tmeas = raw[iolf][iraw+1+ndet+j];
                        if( tmeas<1 ) continue;
                        count = raw[iolf][iraw+1+j];
    
                        olf[iolf]->VS(j)->push_xy( x, count/tmeas/tstep );
    
                    }
                }
            }
            // sum over halfspaces:
            for( int ichop=0; ichop<2; ++ichop ){
                int iolf0 = ichop*2;
                int iolf1 = ichop*2+1;
    
                int nline = raw[iolf0].size();
                if( raw[iolf1].size()!=nline )
                    throw string( "inconsistent raw array sizes" );
    
                for( int iraw=0; iraw<nline; iraw+=(1+ndet*2) ){
                    x = raw[iolf0][iraw];
                    for ( int j=0; j<ndet; ++j ){
                        tmeas = raw[iolf0][iraw+1+ndet+j] +
                            raw[iolf1][iraw+1+ndet+j];
                        if( tmeas<1 ) continue;
                        count = raw[iolf0][iraw+1+j] + raw[iolf1][iraw+1+j];
    
                        olf[6+ichop]->VS(j)->push_xy( x, count/tmeas/tstep );
    
            NOlm::OloAdd( olf[4] );
            NOlm::OloAdd( olf[5] );
    
        }
        if( flag & 2 && flag & 4 ){
    
            NOlm::OloAdd( olf[2] );
            NOlm::OloAdd( olf[3] );
    
            NOlm::OloAdd( olf[0] );
            NOlm::OloAdd( olf[1] );
    
            NOlm::OloAdd( olf[7] );
    
            NOlm::OloAdd( olf[6] );
    
    void NRSSM::ReadSeries( int flag )
    
    
    // flag values (to be OR'ed):
    //    1 save also open
    
    {
        char tstrg[30];
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
        string fser, fnam, name;
    
        int isub;
        vector<CRawfileSpheres> RR;
    
    
        // Read consolidated files:
        fser = wask("Read SPHERES data from series");
        for( isub=0; ; ++isub ){
    
            fnam = fser+"a"+strg(isub);
            ifstream F_in;
            F_in.open(fnam.c_str(),fstream::in);
            if( !(F_in.is_open()) )
                break;
            // cout << "successfully opened "<<fnam<<"\n";
            CRawfileSpheres rf; 
            rf.RdRawYam( F_in );
            RR.push_back( rf );
    
        int nsub = RR.size();
        if( nsub==0 )
    
            throw "could not open file " + fnam;
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
        else if( nsub==1 )
    
            throw string( "series contains just one spectrum -> use a simpler method");
    
        printf( "successfully read %d files\n", nsub );
    
        // Correct time:
        double mean_time =
            ( RR[nsub-1].measured_until - RR[0].measured_until ) / nsub;
        printf( "mean measuring time %g seconds per file\n", mean_time );
        t = (time_t) (RR[0].measured_until-mean_time);
        strftime( tstrg, 30, "%F %b %H:%M:%S", localtime( &t ) );
        printf( "measurement times relative to start time %s\n", tstrg );
        for( isub=0; isub<nsub; ++isub )
            RR[isub].measured_at = RR[isub].measured_until - 
                RR[0].measured_until + (int) (mean_time/2);
    
        // Get parameters, check consistency:
        int ndet = RR[0].angles.size();
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
        printf( "used %i detectors\n", ndet );
    
        double tstep = RR[0].daq_time_step;
        bool incremental_in = RR[0].incremental;
    
        for( isub=1; isub<nsub; ++isub ){
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
            if( RR[isub].angles.size()!=ndet )
                throw string( "inconsistent no of det: file " ) + strg(isub)
                    + " has " + strg(RR[isub].angles.size()) + " instead of "
                    + strg(ndet);
            if( RR[isub].daq_time_step!=tstep )
                throw string( "inconsistent time step" );
            if( RR[isub].incremental!=incremental_in )
                throw string( "inconsistent increment status" );
    
        POld olf[2];
        int iolf;
        for( int iolf=0; iolf<2; ++iolf )
            olf[iolf] = POld( new COld );
        int j, nE;
    
    
        for( iolf=0; iolf<2; ++iolf ){
    
            olf[iolf]->lDoc.push_back( "acquire data from series"+fser );
            olf[iolf]->xco = CCoord( "E", "ueV" );
            olf[iolf]->yco = CCoord( "cts", "sec-1" );
            olf[iolf]->ZCo.push_back( CCoord( "#sub", "") );
            olf[iolf]->ZCo.push_back( CCoord( "det", "") );
    
        }
        mystd::fname_divide( fser, 0, &name, 0 );
    
        olf[0]->name = name;
        olf[1]->name = name+"open";
        olf[0]->lDoc.push_back( "refl, average over both halfspaces" );
        olf[1]->lDoc.push_back( "open, average over both halfspaces" );
    
    
    
        for( isub=0; isub<nsub; ++isub ){
            // ? = (double)RR[isub].measured_at/3600;
            for( j=0; j<ndet; ++j ){
    
                PSpec S( new CSpec );
                S->z.resize( 2 );
                S->z[0] = isub;
                S->z[1] = RR[isub].angles[j];
    
                for( iolf=0; iolf<2; ++iolf )
    
                    olf[iolf]->V.push_back( S );
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
            printf( "new format\n" );
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
            nE = RR[0].rawdata[0].size()/(1+ndet*2);
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
            // Reverse incrementation?
            if( incremental_in ){
                printf( "reversing incrementation\n" );
                for( isub=nsub-1; isub>=1; --isub ){
                    for( int iarr=0; iarr<4; ++iarr ){
                        for( int iE=0; iE<nE; ++iE ){
                            for( j=1; j<1+ndet*2; ++j ){
                                RR[isub].rawdata[iarr][iE*(1+ndet*2)+j] -= 
                                    RR[isub-1].rawdata[iarr][iE*(1+ndet*2)+j];
                            }
                        }
                    }
                }
            }
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
            // Transfer data from raw arrays, sum over halfspaces:
            vector<double> *raw;
            double x, tmeas, count;
            int iraw;
            for( isub=0; isub<nsub; ++isub ){
                raw = RR[isub].rawdata;
                for( int ichop=0; ichop<2; ++ichop ){
                    int iolf0 = ichop*2;
                    int iolf1 = ichop*2+1;
    
                    if( raw[iolf1].size()/(1+ndet*2)!=nE ){
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                        printf( "inconsistent raw array sizes:\n"
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                            "  chop %i raw1 %zu nE %i\n",
    
                                ichop, raw[iolf1].size(), nE );
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                        return;
                    }
    
                    for( int iE=0; iE<nE; ++iE ){
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                        iraw = iE*(1+ndet*2);
                        x = raw[iolf0][iraw];
                        for( j=0; j<ndet; ++j ){
                            tmeas = raw[iolf0][iraw+ndet+1+j] +
                                raw[iolf1][iraw+ndet+1+j];
                            if( tmeas<1 ) continue;
                            count = raw[iolf0][iraw+1+j] + raw[iolf1][iraw+1+j];
    
                            olf[ichop]->VS( isub*ndet+j )->push_xy( 
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                                x, count/tmeas/tstep );
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
        } else {
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
            printf( "old format\n" );
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
            nE = RR[0].rawdata[0].size()/(ndet+2);
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
            // Reverse incrementation?
            if( incremental_in ){
                printf( "reversing incrementation\n" );
                for( isub=nsub-1; isub>=1; --isub ){
                    for( int iarr=0; iarr<4; ++iarr ){
                        for( int iE=0; iE<nE; ++iE ){
                            for( j=1; j<ndet+2; ++j ){
                                RR[isub].rawdata[iarr][iE*(ndet+2)+j] -= 
                                    RR[isub-1].rawdata[iarr][iE*(ndet+2)+j];
                            }
                        }
                    }
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
            }
    
            // Transfer data from raw arrays, sum over halfspaces:
            vector<double> *raw;
            double x, tmeas, count;
            int iraw;
            for( isub=0; isub<nsub; ++isub ){
                raw = RR[isub].rawdata;
                for( int ichop=0; ichop<2; ++ichop ){
                    int iolf0 = ichop*2;
                    int iolf1 = ichop*2+1;
    
                    if( raw[iolf1].size()/(ndet+2)!=nE ){
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                        printf( "inconsistent raw array sizes\n" );
                        return;
                    }
                    for( int iE=0; iE<nE; ++iE ){
                        iraw = iE*(ndet+2);
                        x = raw[iolf0][iraw];
                        tmeas = raw[iolf0][iraw+ndet+1]+raw[iolf1][iraw+ndet+1];
                        if( tmeas<1 ) continue;
                        for( j=0; j<ndet; ++j ){
                            count = raw[iolf0][iraw+1+j] + raw[iolf1][iraw+1+j];
    
                            olf[ichop]->VS( isub*ndet+j )->push_xy( 
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
                                x, count/tmeas/tstep );
                        }
    
    Wuttke, Joachim's avatar
    Wuttke, Joachim committed
    
    
            NOlm::OloAdd( olf[1] );
    
            NOlm::OloAdd( olf[0] );