--- yoda/techmodel/CalibTrk1Reader.cpp 2005/03/09 19:39:47 4.1 +++ yoda/techmodel/CalibTrk1Reader.cpp 2005/05/28 10:44:11 4.4 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/CalibTrk1Reader.cpp,v $ - * $Id: CalibTrk1Reader.cpp,v 4.0 2005/03/06 04:33:02 kusanagi Exp $ + * $Id: CalibTrk1Reader.cpp,v 4.3 2005/03/16 23:23:20 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 4.0 2005/03/06 04:33:02 kusanagi Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/CalibTrk1Reader.cpp,v 4.3 2005/03/16 23:23:20 kusanagi Exp $\n"; } /** @@ -131,12 +131,12 @@ // 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)); + int tempBad_par[3072][6]; + float tempPed_par[3072][6]; + float tempSig_par[3072][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)); for (int i = 0; i < 6; i++){ for (int j = 0; j < 3072; j++){ @@ -146,7 +146,7 @@ } } //----------------------------------------------------------------------------------------- - //delete [] subData; + }