--- yoda/techmodel/CalibTrk1Reader.cpp 2004/09/21 20:24:33 1.6 +++ yoda/techmodel/CalibTrk1Reader.cpp 2004/12/16 17:32:57 2.3 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/CalibTrk1Reader.cpp,v $ - * $Id: CalibTrk1Reader.cpp,v 1.5 2004/08/24 16:01:57 kusanagi Exp $ + * $Id: CalibTrk1Reader.cpp,v 2.2 2004/12/03 22:08:00 kusanagi Exp $ * $Author: kusanagi $ * * Implementation of the LogReader class. @@ -38,7 +38,6 @@ float DSPsig_par[6][3072]; float DSPbad_par[6][3072]; } trkcalib_; - #include } @@ -68,7 +67,7 @@ */ std::string CalibTrk1Reader::GetVersionInfo(void) const { return - "$Header: /home/cvsmanager/yoda/techmodel/CalibTrk1Reader.cpp,v 1.5 2004/08/24 16:01:57 kusanagi Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/CalibTrk1Reader.cpp,v 2.2 2004/12/03 22:08:00 kusanagi Exp $\n"; } /** @@ -85,80 +84,68 @@ * Unpack the CalibTrk event from an input file. */ //void CalibTrkReader::RunEvent(int EventNumber, long int length, char *subData) { -void CalibTrk1Reader::RunEvent(int EventNumber, long int length) { +void CalibTrk1Reader::RunEvent(int EventNumber, long int dataLength) throw (Exception){ std::stringstream oss; - char *subData; - char eventCRC[2]; - UINT16 subCRC; //CRC of the data - UINT16 readCRC; //CRC read from the end of the subpacket - long int dataLength; - - //the 2 bytes subtracted belong to the final event CRC bytes - dataLength = length - (long int)2; - - subData = new char[dataLength]; + char subData[dataLength]; + int ERROR; InputFile->read(subData, sizeof(unsigned char)*dataLength); - subCRC = CM_Compute_CRC16(0, (BYTE*)subData, dataLength); + + //Scrivo un file temporaneo per passarlo alla routine + //Speriamo di cambiare la routine per passargli un buffer..... + DIR *dirp; + std::string pathDir((char*)getenv("YODA_DATA")); + pathDir = pathDir + "/todatemp.dat";; + FILE *pfile; + pfile = fopen((char*)pathDir.c_str(), "wb"); + fwrite(subData, 1, dataLength, pfile); + fclose(pfile); - //took the final CRC to compare it with the previous calculated CRC of the data - InputFile->read(eventCRC, sizeof(eventCRC)); - readCRC = (((UINT16)(eventCRC[0]<<8))&0xFF00) + (((UINT16)eventCRC[1])&0x00FF); - - if (subCRC == readCRC){ - int ERROR; - //Scrivo un file temporaneo per passarlo alla routine - //Speriamo di cambiare la routine per passargli un buffer..... - DIR *dirp; - std::string pathDir((char*)getenv("YODA_DATA")); - pathDir = pathDir + "/todatemp.dat";; - FILE *pfile; - pfile = fopen((char*)pathDir.c_str(), "wb"); - fwrite(subData, 1, dataLength, pfile); - fclose(pfile); - - //Call to the FORTRAN routin that unpack tracker events - trkcalibpkt_(&ERROR, (char*)pathDir.c_str()); - - remove((char*)pathDir.c_str()); - - //Store the unpacked data - 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->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)); - memcpy(calibTrk1->sig_l1, trkcalib_.sig_l1, sizeof(calibTrk1->sig_l1)); - memcpy(calibTrk1->sig_l2, trkcalib_.sig_l2, sizeof(calibTrk1->sig_l2)); - memcpy(calibTrk1->sig_l3, trkcalib_.sig_l3, sizeof(calibTrk1->sig_l3)); - memcpy(calibTrk1->nbad_l1, trkcalib_.nbad_l1, sizeof(calibTrk1->nbad_l1)); - 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)); + //Call to the FORTRAN routin that unpack tracker events + trkcalibpkt_(&ERROR, (char*)pathDir.c_str()); -//--------have to invert array because of FORTRAN <-> C different management of the indexes - int tempBad_par[3072][6]; - int tempPed_par[3072][6]; - int tempSig_par[3072][6]; - 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)); - - for (int i = 0; i < 6; i++){ - for (int j = 0; j < 3072; j++){ - calibTrk1->DSPbad_par[i][j] = tempBad_par[j][i]; - calibTrk1->DSPped_par[i][j] = tempPed_par[j][i]; - calibTrk1->DSPsig_par[i][j] = tempSig_par[j][i]; - } - } -//----------------------------------------------------------------------------------------- - oss.flush(); + if (ERROR != 0) { + oss.str(""); oss << "Fortran77 function trkcalibpkt error code = " << ERROR; logger->warn(oss.str().c_str()); - } else { - logger->debug(_T("Wrong CRC for CalibTrk1 Packet ")); } - delete [] subData; + + remove((char*)pathDir.c_str()); + + //Store the unpacked data + 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->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)); + memcpy(calibTrk1->sig_l1, trkcalib_.sig_l1, sizeof(calibTrk1->sig_l1)); + memcpy(calibTrk1->sig_l2, trkcalib_.sig_l2, sizeof(calibTrk1->sig_l2)); + memcpy(calibTrk1->sig_l3, trkcalib_.sig_l3, sizeof(calibTrk1->sig_l3)); + memcpy(calibTrk1->nbad_l1, trkcalib_.nbad_l1, sizeof(calibTrk1->nbad_l1)); + 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]; + int tempPed_par[3072][6]; + int tempSig_par[3072][6]; + 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)); + + for (int i = 0; i < 6; i++){ + for (int j = 0; j < 3072; j++){ + calibTrk1->DSPbad_par[i][j] = tempBad_par[j][i]; + calibTrk1->DSPped_par[i][j] = tempPed_par[j][i]; + calibTrk1->DSPsig_par[i][j] = tempSig_par[j][i]; + } + } +//----------------------------------------------------------------------------------------- + //delete [] subData; } +