--- yoda/techmodel/CalibTrk1Reader.cpp 2004/12/03 22:08:00 2.2 +++ yoda/techmodel/CalibTrk1Reader.cpp 2005/01/13 14:48:04 2.6 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/CalibTrk1Reader.cpp,v $ - * $Id: CalibTrk1Reader.cpp,v 2.1 2004/10/17 12:28:38 kusanagi Exp $ + * $Id: CalibTrk1Reader.cpp,v 2.5 2005/01/11 23:24:35 kusanagi Exp $ * $Author: kusanagi $ * * Implementation of the LogReader class. @@ -67,7 +67,7 @@ */ std::string CalibTrk1Reader::GetVersionInfo(void) const { return - "$Header: /home/cvsmanager/yoda/techmodel/CalibTrk1Reader.cpp,v 2.1 2004/10/17 12:28:38 kusanagi Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/CalibTrk1Reader.cpp,v 2.5 2005/01/11 23:24:35 kusanagi Exp $\n"; } /** @@ -92,24 +92,25 @@ //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";; + oss.str(""); + oss << getenv("YODA_DATA") << "/" << time(NULL) << "trc1.dat"; FILE *pfile; - pfile = fopen((char*)pathDir.c_str(), "wb"); + pfile = fopen(oss.str().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()); + trkcalibpkt_(&ERROR, (char*)oss.str().c_str()); + 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*)pathDir.c_str()); + remove((char*)oss.str().c_str()); //Store the unpacked data memcpy(calibTrk1->DAQmode, trkcalib_.DAQmode, sizeof(calibTrk1->DAQmode)); @@ -145,7 +146,7 @@ } } //----------------------------------------------------------------------------------------- - delete [] subData; + //delete [] subData; }