Skip to content
Snippets Groups Projects
Commit a0568db4 authored by John Baines's avatar John Baines Committed by Graeme Stewart
Browse files

remove redundant layers parameter from constructor for clusters (TrigFTK_RawDataTPCnv-00-00-09)

parent 1509682a
No related branches found
No related tags found
No related merge requests found
################################################################################
# Package: TrigFTK_RawDataTPCnv
################################################################################
# Declare the package name:
atlas_subdir( TrigFTK_RawDataTPCnv )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Database/AthenaPOOL/AthenaPoolCnvSvc
Database/AthenaPOOL/AthenaPoolUtilities
Trigger/TrigFTK/TrigFTK_RawData
PRIVATE
AtlasTest/TestTools
Control/AthenaKernel
GaudiKernel )
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_tpcnv_library( TrigFTK_RawDataTPCnv
src/*.cxx
PUBLIC_HEADERS TrigFTK_RawDataTPCnv
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigFTK_RawData TestTools AthenaKernel GaudiKernel )
atlas_add_dictionary( TrigFTK_RawDataTPCnvDict
TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict.h
TrigFTK_RawDataTPCnv/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigFTK_RawData TestTools AthenaKernel GaudiKernel TrigFTK_RawDataTPCnv )
atlas_add_test( FTK_RawTrackCnv_p1_test
SOURCES
test/FTK_RawTrackCnv_p1_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigFTK_RawData TestTools AthenaKernel GaudiKernel TrigFTK_RawDataTPCnv )
......@@ -28,6 +28,7 @@ apply_pattern tpcnv_library
private
use AthenaKernel AthenaKernel-* Control
use GaudiInterface GaudiInterface-* External
use AtlasReflex AtlasReflex-* External
# Create a dictionary for the persistent representation
......@@ -39,3 +40,7 @@ apply_pattern lcgdict dict=TrigFTK_RawDataTPCnv \
headerfiles="../TrigFTK_RawDataTPCnv/TrigFTK_RawDataTPCnvDict.h"
end_private
private
use TestTools TestTools-* AtlasTest
apply_pattern UnitTest_run unit_test=FTK_RawTrackCnv_p1
test1
......@@ -2,26 +2,14 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
#define private public
#define protected public
#include "TrigFTK_RawData/FTK_RawTrack.h"
#undef private
#undef protected
#include "TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h"
#include "TrigFTK_RawDataTPCnv/FTK_RawTrack_p1.h"
void FTK_RawTrackCnv_p1::persToTrans(const FTK_RawTrack_p1* persObj,
FTK_RawTrack* transObj,
MsgStream &log)
MsgStream &/*log*/)
{
// log << MSG::INFO << "FTK_RawTrackCnv_p1::persToTrans called" << endreq;
// log << MSG::ATH << "FTK_RawTrackCnv_p1:: m_pars[th1] = " << persObj->m_pars[th1] << endreq;
// log << MSG::ATH << "FTK_RawTrackCnv_p1:: m_pars[th2] = " << persObj->m_pars[th2] << endreq;
// log << MSG::ATH << "FTK_RawTrackCnv_p1:: m_pars[th3] = " << persObj->m_pars[th3] << endreq;
// log << MSG::ATH << "FTK_RawTrackCnv_p1:: m_pars[th4] = " << persObj->m_pars[th4] << endreq;
// log << MSG::ATH << "FTK_RawTrackCnv_p1:: m_pars[th5] = " << persObj->m_pars[th5] << endreq;
// log << MSG::ATH << "FTK_RawTrackCnv_p1:: m_pars[th4] = " << persObj->m_barcode << endreq;
transObj->setTH1(persObj->m_pars[th1]);
transObj->setTH2(persObj->m_pars[th2]);
......@@ -32,97 +20,25 @@ void FTK_RawTrackCnv_p1::persToTrans(const FTK_RawTrack_p1* persObj,
transObj->setBarcode(persObj->m_barcode);
// Pixel Clusters //
FTK_RawPixelCluster pixel_1(0), pixel_2(1), pixel_3(2), pixel_4(3);
/*FTK_RawPixelCluster* pixel_1 = new FTK_RawPixelCluster(0);
FTK_RawPixelCluster* pixel_2 = new FTK_RawPixelCluster(1);
FTK_RawPixelCluster* pixel_3 = new FTK_RawPixelCluster(2);
FTK_RawPixelCluster* pixel_4 = new FTK_RawPixelCluster(3);
pixel_1->setWordA(persObj->m_pars_pix[0]);
pixel_1->setWordB(persObj->m_pars_pix[1]);
pixel_1->setBarcode(persObj->m_barcodes_pix[0]);
// log << MSG::INFO << persObj->m_barcodes_pix[0] << endreq;
pixel_2->setWordA(persObj->m_pars_pix[2]);
pixel_2->setWordB(persObj->m_pars_pix[3]);
pixel_2->setBarcode(persObj->m_barcodes_pix[1]);
pixel_3->setWordA(persObj->m_pars_pix[4]);
pixel_3->setWordB(persObj->m_pars_pix[5]);
pixel_3->setBarcode(persObj->m_barcodes_pix[2]);
pixel_4->setWordA(persObj->m_pars_pix[6]);
pixel_4->setWordB(persObj->m_pars_pix[7]);
pixel_3->setBarcode(persObj->m_barcodes_pix[3]);
std::vector<FTK_RawPixelCluster*> pixel_clusters;
pixel_clusters.push_back(pixel_1);
pixel_clusters.push_back(pixel_2);
pixel_clusters.push_back(pixel_3);
pixel_clusters.push_back(pixel_4);
transObj->setPixelClusters(pixel_clusters);*/
pixel_1.setWordA(persObj->m_pars_pix[0]);
pixel_1.setWordB(persObj->m_pars_pix[1]);
pixel_1.setBarcode(persObj->m_barcodes_pix[0]);
pixel_2.setWordA(persObj->m_pars_pix[2]);
pixel_2.setWordB(persObj->m_pars_pix[3]);
pixel_2.setBarcode(persObj->m_barcodes_pix[1]);
pixel_3.setWordA(persObj->m_pars_pix[4]);
pixel_3.setWordB(persObj->m_pars_pix[5]);
pixel_3.setBarcode(persObj->m_barcodes_pix[2]);
std::vector<FTK_RawPixelCluster> pix_clusters;
unsigned int iword=0;
for (unsigned int ipix=0; ipix<4; ipix++) {
FTK_RawPixelCluster pix_clus(persObj->m_pars_pix[iword], persObj->m_pars_pix[iword+1],persObj->m_barcodes_pix[ipix]);
iword+=2;
pix_clusters.push_back(pix_clus);
}
transObj->setPixelClusters(pix_clusters);
pixel_4.setWordA(persObj->m_pars_pix[6]);
pixel_4.setWordB(persObj->m_pars_pix[7]);
pixel_4.setBarcode(persObj->m_barcodes_pix[3]);
std::vector<FTK_RawPixelCluster> pixel_clusters;
pixel_clusters.push_back(pixel_1);
pixel_clusters.push_back(pixel_2);
pixel_clusters.push_back(pixel_3);
pixel_clusters.push_back(pixel_4);
transObj->setPixelClusters(pixel_clusters);
// SCT Clusters //
FTK_RawSCT_Cluster sct_1(4), sct_2(5), sct_3(6), sct_4(7), sct_5(8), sct_6(9), sct_7(10), sct_8(11);
sct_1.setWord( persObj->m_pars_sct[0]);
sct_1.setBarcode( persObj->m_barcodes_sct[0]);
sct_2.setWord( persObj->m_pars_sct[1]);
sct_2.setBarcode( persObj->m_barcodes_sct[1]);
sct_3.setWord( persObj->m_pars_sct[2]);
sct_3.setBarcode( persObj->m_barcodes_sct[2]);
sct_4.setWord( persObj->m_pars_sct[3]);
sct_4.setBarcode( persObj->m_barcodes_sct[3]);
sct_5.setWord( persObj->m_pars_sct[4]);
sct_5.setBarcode( persObj->m_barcodes_sct[4]);
sct_6.setWord( persObj->m_pars_sct[5]);
sct_6.setBarcode( persObj->m_barcodes_sct[5]);
sct_7.setWord( persObj->m_pars_sct[6]);
sct_7.setBarcode( persObj->m_barcodes_sct[6]);
sct_8.setWord( persObj->m_pars_sct[7]);
sct_8.setBarcode( persObj->m_barcodes_sct[7]);
FTK_RawSCT_Cluster sct_1(), sct_2(), sct_3(), sct_4(), sct_5(), sct_6(), sct_7(), sct_8;
std::vector<FTK_RawSCT_Cluster> sct_clusters;
sct_clusters.push_back(sct_1);
sct_clusters.push_back(sct_2);
sct_clusters.push_back(sct_3);
sct_clusters.push_back(sct_4);
sct_clusters.push_back(sct_5);
sct_clusters.push_back(sct_6);
sct_clusters.push_back(sct_7);
sct_clusters.push_back(sct_8);
for (unsigned int isct=0; isct<8; isct++) {
FTK_RawSCT_Cluster sct_clus(persObj->m_pars_sct[isct], persObj->m_barcodes_sct[isct]);
sct_clusters.push_back(sct_clus);
}
transObj->setSCTClusters(sct_clusters);
}
......@@ -140,10 +56,11 @@ void FTK_RawTrackCnv_p1::transToPers(const FTK_RawTrack* transObj,
persObj->m_pars[th6] = transObj->getTH6();
persObj->m_barcode = transObj->getBarcode();
// Pixel Clusters //
/* persObj->m_pars_pix[0] = transObj->getPixelCluster(0).getWordA();
persObj->m_pars_pix[1] = transObj->getPixelCluster(0).getWordB();
persObj->m_barcodes_pix[0] = transObj->getPixelCluster(0).getBarcode();
//Pixel Clusters
persObj->m_pars_pix[0] = transObj->getPixelWordA(0);
persObj->m_pars_pix[1] = transObj->getPixelWordB(0);
persObj->m_barcodes_pix[0] = transObj->getPixelBarcode(0);
persObj->m_pars_pix[2] = transObj->getPixelCluster(1).getWordA();
persObj->m_pars_pix[3] = transObj->getPixelCluster(1).getWordB();
......@@ -180,55 +97,7 @@ void FTK_RawTrackCnv_p1::transToPers(const FTK_RawTrack* transObj,
persObj->m_barcodes_sct[6] = transObj->getSCTCluster(6).getBarcode();
persObj->m_pars_sct[7] = transObj->getSCTCluster(7).getWord();
persObj->m_barcodes_sct[7] = transObj->getSCTCluster(7).getBarcode();*/
FTK_RawTrack trans_track = *(const_cast<FTK_RawTrack*>(transObj));
// Pixel Clusters //
// persObj->m_pars_pix[0] = trans_track.getPixelCluster(0).getWordA();
// persObj->m_pars_pix[1] = trans_track.getPixelCluster(0).getWordB();
// persObj->m_barcodes_pix[0] = trans_track.getPixelCluster(0).getBarcode();
persObj->m_pars_pix[0] = trans_track.getPixelWordA(0);
persObj->m_pars_pix[1] = trans_track.getPixelWordB(0);
persObj->m_barcodes_pix[0] = trans_track.getPixelBarcode(0);
// log << MSG::INFO << "FTK_RawTrackCnv_p1::pixel barcode" << trans_track.getPixelCluster(0)->getBarcode() << endreq;
// log << MSG::INFO << "FTK_RawTrackCnv_p1::pixel barcode" << persObj->m_barcodes_pix[0] << endreq;
persObj->m_pars_pix[2] = trans_track.getPixelCluster(1).getWordA();
persObj->m_pars_pix[3] = trans_track.getPixelCluster(1).getWordB();
persObj->m_barcodes_pix[1] = trans_track.getPixelCluster(1).getBarcode();
persObj->m_pars_pix[4] = trans_track.getPixelCluster(2).getWordA();
persObj->m_pars_pix[5] = trans_track.getPixelCluster(2).getWordB();
persObj->m_barcodes_pix[2] = trans_track.getPixelCluster(2).getBarcode();
persObj->m_pars_pix[6] = trans_track.getPixelCluster(3).getWordA();
persObj->m_pars_pix[7] = trans_track.getPixelCluster(3).getWordB();
persObj->m_barcodes_pix[3] = trans_track.getPixelCluster(3).getBarcode();
// SCT Clusters //
persObj->m_pars_sct[0] = trans_track.getSCTCluster(0).getWord();
persObj->m_barcodes_sct[0] = trans_track.getSCTCluster(0).getBarcode();
persObj->m_pars_sct[1] = trans_track.getSCTCluster(1).getWord();
persObj->m_barcodes_sct[1] = trans_track.getSCTCluster(1).getBarcode();
persObj->m_pars_sct[2] = trans_track.getSCTCluster(2).getWord();
persObj->m_barcodes_sct[2] = trans_track.getSCTCluster(2).getBarcode();
persObj->m_pars_sct[3] = trans_track.getSCTCluster(3).getWord();
persObj->m_barcodes_sct[3] = trans_track.getSCTCluster(3).getBarcode();
persObj->m_pars_sct[4] = trans_track.getSCTCluster(4).getWord();
persObj->m_barcodes_sct[4] = trans_track.getSCTCluster(4).getBarcode();
persObj->m_pars_sct[5] = trans_track.getSCTCluster(5).getWord();
persObj->m_barcodes_sct[5] = trans_track.getSCTCluster(5).getBarcode();
persObj->m_pars_sct[6] = trans_track.getSCTCluster(6).getWord();
persObj->m_barcodes_sct[6] = trans_track.getSCTCluster(6).getBarcode();
persObj->m_pars_sct[7] = trans_track.getSCTCluster(7).getWord();
persObj->m_barcodes_sct[7] = trans_track.getSCTCluster(7).getBarcode();
persObj->m_barcodes_sct[7] = transObj->getSCTCluster(7).getBarcode();
}
......@@ -2,12 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
#define private public
#define protected public
#include "TrigFTK_RawData/FTK_RawTrackContainer.h"
#undef private
#undef protected
#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainerCnv_p1.h"
#include "TrigFTK_RawDataTPCnv/FTK_RawTrackContainer_p1.h"
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
/**
* @file TrigFTK_RawDataTPCnv/test/FTK_RawTrackCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
* @date Feb, 2016
* @brief Tests for FTK_RawTrackCnv_p1.
*/
#undef NDEBUG
#include "TrigFTK_RawDataTPCnv/FTK_RawTrackCnv_p1.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
void compare (const FTK_RawPixelCluster& p1,
const FTK_RawPixelCluster& p2)
{
assert (p1.getWordA() == p2.getWordA());
assert (p1.getWordB() == p2.getWordB());
assert (p1.getBarcode() == p2.getBarcode());
}
void compare (const FTK_RawSCT_Cluster& p1,
const FTK_RawSCT_Cluster& p2)
{
assert (p1.getWord() == p2.getWord());
assert (p1.getBarcode() == p2.getBarcode());
}
void compare (const std::vector<FTK_RawPixelCluster>& p1,
const std::vector<FTK_RawPixelCluster>& p2)
{
assert (p1.size() == p2.size());
for (size_t i = 0; i < p1.size(); i++)
compare (p1[i], p2[i]);
}
void compare (const std::vector<FTK_RawSCT_Cluster>& p1,
const std::vector<FTK_RawSCT_Cluster>& p2)
{
assert (p1.size() == p2.size());
for (size_t i = 0; i < p1.size(); i++)
compare (p1[i], p2[i]);
}
void compare (const FTK_RawTrack& p1,
const FTK_RawTrack& p2)
{
assert (p1.getTH1() == p2.getTH1());
assert (p1.getTH2() == p2.getTH2());
assert (p1.getTH3() == p2.getTH3());
assert (p1.getTH4() == p2.getTH4());
assert (p1.getTH5() == p2.getTH5());
assert (p1.getTH6() == p2.getTH6());
assert (p1.getBarcode() == p2.getBarcode());
compare (p1.getPixelClusters(), p2.getPixelClusters());
compare (p1.getSCTClusters(), p2.getSCTClusters());
}
void testit (const FTK_RawTrack& trans1)
{
MsgStream log (0, "test");
FTK_RawTrackCnv_p1 cnv;
FTK_RawTrack_p1 pers;
cnv.transToPers (&trans1, &pers, log);
FTK_RawTrack trans2;
cnv.persToTrans (&pers, &trans2, log);
compare (trans1, trans2);
}
void test1()
{
std::cout << "test1\n";
FTK_RawTrack trans1 (123, 234, 345, 456, 567, 678);
trans1.setBarcode (789);
for (size_t i=0; i < trans1.getPixelClusters().size(); i++) {
trans1.setPixelCluster (i,FTK_RawPixelCluster (11 + i*100, 22 + i*100));
trans1.getPixelClusters()[i].setBarcode (33 + i*100);
}
for (size_t i=0; i < trans1.getSCTClusters().size(); i++) {
trans1.setSCTCluster (i,FTK_RawSCT_Cluster (44 + i*100, 55 + i*100));
}
testit (trans1);
}
int main()
{
test1();
return 0;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment