--- yoda/techmodel/CalibTrk1Reader.cpp 2005/08/29 09:46:13 5.0 +++ yoda/techmodel/CalibTrk1Reader.cpp 2006/05/30 19:10:02 6.1 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/CalibTrk1Reader.cpp,v $ - * $Id: CalibTrk1Reader.cpp,v 4.4 2005/05/28 10:44:11 kusanagi Exp $ + * $Id: CalibTrk1Reader.cpp,v 6.0 2006/02/07 17:11:09 kusanagi Exp $ * $Author: kusanagi $ * * Implementation of the LogReader class. @@ -8,47 +8,38 @@ * Control the CRC for the entire data Packet not just for single records */ -#define UINT unsigned int -#define BYTE unsigned char -#include -#include +#include "ReaderAlgorithms.h" + extern "C" { #include "CRC.h" - //The int* return the error code - //The char* is the path to the temporary file - extern void trkcalibpkt_(int*, char*); + extern void trkcalibpkt_(int*, unsigned char[], long int*, int*); //(*) //Struct per il passaggio di dati da e verso la chiamata fortran extern struct { - int DAQmode[6]; - int DSPnumber[6]; - int calibnumber[6]; - int ncalib_event[6]; - int ped_l1[6]; - int ped_l2[6]; - int ped_l3[6]; - int sig_l1[6]; - int sig_l2[6]; - int sig_l3[6]; - int nbad_l1[6]; - int nbad_l2[6]; - int nbad_l3[6]; - int cal_flag[6]; - float DSPped_par[6][3072]; - float DSPsig_par[6][3072]; - int DSPbad_par[6][3072]; + int good0; + int DAQmode[6]; + int DSPnumber[6]; + int calibnumber[6]; + int ncalib_event[6]; + int ped_l1[6]; + int ped_l2[6]; + int ped_l3[6]; + int sig_l1[6]; + int sig_l2[6]; + int sig_l3[6]; + int nbad_l1[6]; + int nbad_l2[6]; + int nbad_l3[6]; + int cal_flag[6]; + float DSPped_par[3072][6]; + float DSPsig_par[3072][6]; + int DSPbad_par[3072][6]; + int crc_cal[3][6]; + int crc_hcal[6]; } trkcalib_; #include } -#include -#include "stdio.h" -#include "ReaderAlgorithms.h" -#include "event/PamelaRun.h" - -#include "event/CalibTrk1Event.h" - -using namespace pamela; using namespace pamela::techmodel; static log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(_T("pamela.techmodel.CalibTrk1Reader")); @@ -67,7 +58,7 @@ */ std::string CalibTrk1Reader::GetVersionInfo(void) const { return - "$Header: /home/cvsmanager/yoda/techmodel/CalibTrk1Reader.cpp,v 4.4 2005/05/28 10:44:11 kusanagi Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/CalibTrk1Reader.cpp,v 6.0 2006/02/07 17:11:09 kusanagi Exp $\n"; } /** @@ -89,34 +80,27 @@ char subData[dataLength]; int ERROR; InputFile->read(subData, sizeof(unsigned char)*dataLength); - - //Scrivo un file temporaneo per passarlo alla routine - //Speriamo di cambiare la routine per passargli un buffer..... - oss.str(""); - oss << getenv("YODA_DATA") << "/" << time(NULL) << "trc1.dat"; - FILE *pfile; - pfile = fopen(oss.str().c_str(), "wb"); - fwrite(subData, 1, dataLength, pfile); - fclose(pfile); + char *data = new char[dataLength]; + memcpy(data, subData, dataLength); + int curpos=1; + //Call to the FORTRAN routin that unpack tracker events - trkcalibpkt_(&ERROR, (char*)oss.str().c_str()); + trkcalibpkt_( &ERROR,(unsigned char*)data, &dataLength, &curpos); calibTrk1->unpackError = ERROR; - remove(oss.str().c_str()); if (ERROR != 0) { oss.str(""); oss << "Fortran77 function trkcalibpkt error code = " << ERROR; logger->warn(oss.str().c_str()); } - remove((char*)oss.str().c_str()); - //Store the unpacked data + calibTrk1->good0 = trkcalib_.good0; memcpy(calibTrk1->DAQmode, trkcalib_.DAQmode, sizeof(calibTrk1->DAQmode)); memcpy(calibTrk1->DSPnumber, trkcalib_.DSPnumber, sizeof(calibTrk1->DSPnumber)); memcpy(calibTrk1->calibnumber, trkcalib_.calibnumber, sizeof(calibTrk1->calibnumber)); - memcpy(calibTrk1->DSPnumber, trkcalib_.ncalib_event, sizeof(calibTrk1->ncalib_event)); + memcpy(calibTrk1->ncalib_event, trkcalib_.ncalib_event, sizeof(calibTrk1->ncalib_event)); memcpy(calibTrk1->ped_l1, trkcalib_.ped_l1, sizeof(calibTrk1->ped_l1)); memcpy(calibTrk1->ped_l2, trkcalib_.ped_l2, sizeof(calibTrk1->ped_l2)); memcpy(calibTrk1->ped_l3, trkcalib_.ped_l3, sizeof(calibTrk1->ped_l3)); @@ -127,16 +111,15 @@ memcpy(calibTrk1->nbad_l2, trkcalib_.nbad_l2, sizeof(calibTrk1->nbad_l2)); memcpy(calibTrk1->nbad_l3, trkcalib_.nbad_l3, sizeof(calibTrk1->nbad_l3)); memcpy(calibTrk1->cal_flag, trkcalib_.cal_flag, sizeof(calibTrk1->cal_flag)); -// memcpy(calibTrk1->DSPbad_par, trkcalib_.DSPbad_par, sizeof(calibTrk1->DSPbad_par)); -// memcpy(calibTrk1->DSPped_par, trkcalib_.DSPped_par, sizeof(calibTrk1->DSPped_par)); -// memcpy(calibTrk1->DSPsig_par, trkcalib_.DSPsig_par, sizeof(calibTrk1->DSPsig_par)); -//--------have to invert array because of FORTRAN <-> C different management of the indexes + int tempBad_par[3072][6]; float tempPed_par[3072][6]; float tempSig_par[3072][6]; + int tempCrc_cal[3][6]; memcpy(tempBad_par,trkcalib_.DSPbad_par, sizeof(tempBad_par)); memcpy(tempPed_par,trkcalib_.DSPped_par, sizeof(tempPed_par)); memcpy(tempSig_par,trkcalib_.DSPsig_par, sizeof(tempSig_par)); + memcpy(tempCrc_cal,trkcalib_.crc_cal, sizeof(tempCrc_cal)); for (int i = 0; i < 6; i++){ for (int j = 0; j < 3072; j++){ @@ -144,6 +127,9 @@ calibTrk1->DSPped_par[i][j] = tempPed_par[j][i]; calibTrk1->DSPsig_par[i][j] = tempSig_par[j][i]; } + for (int k = 0; k < 3; k++){ + calibTrk1->crc_cal[i][k] = tempCrc_cal[k][i]; + } } //-----------------------------------------------------------------------------------------