diff --git a/Trigger/TrigT1/TrigT1TRT/TrigT1TRT/TrigT1TRT.h b/Trigger/TrigT1/TrigT1TRT/TrigT1TRT/TrigT1TRT.h
index e33a5634505f3b6995b84471506ef40b444a2d5f..51770aca22542809995a1f69c4bbf0973971d73d 100644
--- a/Trigger/TrigT1/TrigT1TRT/TrigT1TRT/TrigT1TRT.h
+++ b/Trigger/TrigT1/TrigT1TRT/TrigT1TRT/TrigT1TRT.h
@@ -36,7 +36,7 @@ namespace LVL1 {
const TRT_ID* m_pTRTHelper;
- const InDetDD::TRT_DetectorManager *mgr;
+ const InDetDD::TRT_DetectorManager *m_mgr;
ServiceHandle<ITRT_StrawNeighbourSvc> m_TRTStrawNeighbourSvc;
@@ -50,10 +50,10 @@ namespace LVL1 {
int EndcapStrawNumber(int strawNumber,int strawLayerNumber,int LayerNumber,int phi_stack,int side);
int BarrelStrawLayerNumber(int strawLayerNumber, int LayerNumber);
- unsigned char mat_chip_barrel[64][1642];
- unsigned char mat_chip_endcap[64][3840];
+ unsigned char m_mat_chip_barrel[64][1642];
+ unsigned char m_mat_chip_endcap[64][3840];
- int numberOfStraws[75];
+ int m_numberOfStraws[75];
};
}
diff --git a/Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx b/Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx
index 79fbf6c085cdccf27f3e17f8f584f73b48a8ff73..471174736aa4f4354b550c9e93e08b6c150da0af 100644
--- a/Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx
+++ b/Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx
@@ -30,49 +30,27 @@ namespace LVL1 {
}
StatusCode TrigT1TRT::initialize() {
- if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Initialising" << endmsg;
+ ATH_MSG_INFO( "Initialising" );
- if (Algorithm::initialize().isFailure()) {
- if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't initialize Algorithm base class." << endmsg;
- return StatusCode::FAILURE;
- }
- StatusCode sc;
+ ATH_CHECK( Algorithm::initialize() );
- // Connect to the LVL1ConfigSvc to retrieve threshold settings.
- sc = m_configSvc.retrieve();
- if (sc.isFailure()) {
- if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName() << endmsg;
- return sc;
- } else {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Connected to " << m_configSvc.typeAndName() << endmsg;
- }
+ ATH_CHECK( m_configSvc.retrieve() );
+ ATH_MSG_DEBUG( "Connected to " << m_configSvc.typeAndName() );
- // retrieve TRT Detector Manager
- sc = detStore()->retrieve(mgr, "TRT");
- if (sc.isFailure()) {
- if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to TRT DetectorManager" << endmsg;
- return sc;
- } else {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Connected to TRT DetectorManager" << endmsg;
- }
+ ATH_CHECK( detStore()->retrieve(m_mgr, "TRT") );
+ ATH_MSG_DEBUG( "Connected to TRT DetectorManager" );
- // retrieve TRT Helper
- sc = detStore()->retrieve(m_pTRTHelper,"TRT_ID");
- if (sc.isFailure()) {
- if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to TRT Helper" << endmsg;
- return sc;
- } else {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Connected to TRT Helper" << endmsg;
- }
+ ATH_CHECK( detStore()->retrieve(m_pTRTHelper,"TRT_ID") );
+ ATH_MSG_DEBUG( "Connected to TRT Helper" );
// retrieve TRT_StrawNeighbourService.
if (m_TRTStrawNeighbourSvc.name() == "") {
- if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "TRT_StrawNeighbourSvc not given." << endmsg;
- } else { sc = m_TRTStrawNeighbourSvc.retrieve();
- if(sc.isFailure()){
- if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Could not get StrawNeighbourSvc!" << endmsg;
- }
+ ATH_MSG_WARNING( "TRT_StrawNeighbourSvc not given." );
+ }
+ else {
+ ATH_CHECK( m_TRTStrawNeighbourSvc.retrieve() );
+ ATH_MSG_FATAL( "Could not get StrawNeighbourSvc!" );
}
// Get level 1 TRT threshold settings from the level 1
@@ -83,9 +61,9 @@ namespace LVL1 {
std::vector<TrigConf::TriggerThreshold*>::iterator th_itr_end = thresholds.end();
for(;th_itr!=th_itr_end;th_itr++) {
if(*th_itr == 0) continue;
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold name=" << (*th_itr)->name() << endmsg;
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold value=" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() << endmsg;
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Thershold cablestart=" << (*th_itr)->cableStart() << endmsg;
+ ATH_MSG_DEBUG( "1-bit Threshold name=" << (*th_itr)->name() );
+ ATH_MSG_DEBUG( "1-bit Threshold value=" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() );
+ ATH_MSG_DEBUG( "1-bit Thershold cablestart=" << (*th_itr)->cableStart() );
if ((*th_itr)->name() == "TRTfast") {
m_cablestarts[0]=(*th_itr)->cableStart();
}
@@ -94,16 +72,16 @@ namespace LVL1 {
if(thresholds.size()==0)
{
- msg(MSG::WARNING) << "No TRT thresholds found. Checking NIM thresholds for known TRT thresholds. THIS IS A HACK!"<<endmsg;
+ ATH_MSG_WARNING( "No TRT thresholds found. Checking NIM thresholds for known TRT thresholds. THIS IS A HACK!" );
thresholds = m_configSvc->thresholdConfig()->getThresholdVector(TrigConf::L1DataDef::NIM);
th_itr = thresholds.begin();
th_itr_end = thresholds.end();
for(;th_itr!=th_itr_end;th_itr++) {
if(*th_itr == 0) continue;
if ((*th_itr)->name() == "NIMDIR25") {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold name=" << (*th_itr)->name() << endmsg;
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold value=" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() << endmsg;
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Thershold cablestart=" << (*th_itr)->cableStart() << endmsg;
+ ATH_MSG_DEBUG( "1-bit Threshold name=" << (*th_itr)->name() );
+ ATH_MSG_DEBUG( "1-bit Threshold value=" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() );
+ ATH_MSG_DEBUG( "1-bit Thershold cablestart=" << (*th_itr)->cableStart() );
m_cablestarts[0]=(*th_itr)->cableStart();
}
}
@@ -112,31 +90,31 @@ namespace LVL1 {
//Initialize numberOfStraws array for use in strawNumber function.
for(int j=0; j<75; j++) {
- numberOfStraws[j]=0;
+ m_numberOfStraws[j]=0;
}
- // numberofstraws in a phi module layer. numberOfStraws[<layer number>]
- numberOfStraws[1]=15;
- numberOfStraws[2]=numberOfStraws[3]=numberOfStraws[4]=numberOfStraws[5]=16;
- numberOfStraws[6]=numberOfStraws[7]=numberOfStraws[8]=numberOfStraws[9]=numberOfStraws[10]=17;
- numberOfStraws[11]=numberOfStraws[12]=numberOfStraws[13]=numberOfStraws[14]=numberOfStraws[15]=18;
- numberOfStraws[16]=numberOfStraws[17]=numberOfStraws[18]=19;
- numberOfStraws[19]=18;
- numberOfStraws[20]=19;
- numberOfStraws[21]=numberOfStraws[22]=numberOfStraws[23]=numberOfStraws[24]=numberOfStraws[25]=20;
- numberOfStraws[26]=numberOfStraws[27]=numberOfStraws[28]=numberOfStraws[29]=numberOfStraws[30]=21;
- numberOfStraws[31]=numberOfStraws[32]=numberOfStraws[33]=numberOfStraws[34]=numberOfStraws[35]=22;
- numberOfStraws[36]=numberOfStraws[37]=numberOfStraws[38]=numberOfStraws[39]=numberOfStraws[40]=23;
- numberOfStraws[41]=numberOfStraws[42]=24;
- numberOfStraws[43]=23;
- numberOfStraws[44]=23;
- numberOfStraws[45]=numberOfStraws[46]=numberOfStraws[47]=numberOfStraws[48]=24;
- numberOfStraws[49]=numberOfStraws[50]=numberOfStraws[51]=numberOfStraws[52]=numberOfStraws[53]=25;
- numberOfStraws[54]=numberOfStraws[55]=numberOfStraws[56]=numberOfStraws[57]=numberOfStraws[58]=26;
- numberOfStraws[59]=numberOfStraws[60]=numberOfStraws[61]=numberOfStraws[62]=numberOfStraws[63]=27;
- numberOfStraws[64]=numberOfStraws[65]=numberOfStraws[66]=numberOfStraws[67]=numberOfStraws[68]=28;
- numberOfStraws[69]=numberOfStraws[70]=numberOfStraws[71]=numberOfStraws[72]=29;
- numberOfStraws[73]=28;
+ // numberofstraws in a phi module layer. m_numberOfStraws[<layer number>]
+ m_numberOfStraws[1]=15;
+ m_numberOfStraws[2]=m_numberOfStraws[3]=m_numberOfStraws[4]=m_numberOfStraws[5]=16;
+ m_numberOfStraws[6]=m_numberOfStraws[7]=m_numberOfStraws[8]=m_numberOfStraws[9]=m_numberOfStraws[10]=17;
+ m_numberOfStraws[11]=m_numberOfStraws[12]=m_numberOfStraws[13]=m_numberOfStraws[14]=m_numberOfStraws[15]=18;
+ m_numberOfStraws[16]=m_numberOfStraws[17]=m_numberOfStraws[18]=19;
+ m_numberOfStraws[19]=18;
+ m_numberOfStraws[20]=19;
+ m_numberOfStraws[21]=m_numberOfStraws[22]=m_numberOfStraws[23]=m_numberOfStraws[24]=m_numberOfStraws[25]=20;
+ m_numberOfStraws[26]=m_numberOfStraws[27]=m_numberOfStraws[28]=m_numberOfStraws[29]=m_numberOfStraws[30]=21;
+ m_numberOfStraws[31]=m_numberOfStraws[32]=m_numberOfStraws[33]=m_numberOfStraws[34]=m_numberOfStraws[35]=22;
+ m_numberOfStraws[36]=m_numberOfStraws[37]=m_numberOfStraws[38]=m_numberOfStraws[39]=m_numberOfStraws[40]=23;
+ m_numberOfStraws[41]=m_numberOfStraws[42]=24;
+ m_numberOfStraws[43]=23;
+ m_numberOfStraws[44]=23;
+ m_numberOfStraws[45]=m_numberOfStraws[46]=m_numberOfStraws[47]=m_numberOfStraws[48]=24;
+ m_numberOfStraws[49]=m_numberOfStraws[50]=m_numberOfStraws[51]=m_numberOfStraws[52]=m_numberOfStraws[53]=25;
+ m_numberOfStraws[54]=m_numberOfStraws[55]=m_numberOfStraws[56]=m_numberOfStraws[57]=m_numberOfStraws[58]=26;
+ m_numberOfStraws[59]=m_numberOfStraws[60]=m_numberOfStraws[61]=m_numberOfStraws[62]=m_numberOfStraws[63]=27;
+ m_numberOfStraws[64]=m_numberOfStraws[65]=m_numberOfStraws[66]=m_numberOfStraws[67]=m_numberOfStraws[68]=28;
+ m_numberOfStraws[69]=m_numberOfStraws[70]=m_numberOfStraws[71]=m_numberOfStraws[72]=29;
+ m_numberOfStraws[73]=28;
//loop over straw hash index to create straw number mapping for TRTViewer
unsigned int maxHash = m_pTRTHelper->straw_layer_hash_max();
@@ -156,7 +134,7 @@ namespace LVL1 {
// BARREL
int idSide = idBarrelEndcap?1:-1;
if(m_pTRTHelper->barrel_ec(id)==-1) {
- element = mgr->getBarrelElement(idSide, idLayerWheel, idPhiModule, idStrawLayer);
+ element = m_mgr->getBarrelElement(idSide, idLayerWheel, idPhiModule, idStrawLayer);
if (element == NULL) {
continue;
}
@@ -179,8 +157,8 @@ namespace LVL1 {
if (idLayerWheel == 1) i_chip+=21;
if (idLayerWheel == 2) i_chip+=54;
- mat_chip_barrel[idPhiModule][tempStrawNumber]=i_chip;
- mat_chip_barrel[idPhiModule+32][tempStrawNumber]=i_chip;
+ m_mat_chip_barrel[idPhiModule][tempStrawNumber]=i_chip;
+ m_mat_chip_barrel[idPhiModule+32][tempStrawNumber]=i_chip;
}
}
} else if (m_pTRTHelper->barrel_ec(id)!=1) {
@@ -192,7 +170,7 @@ namespace LVL1 {
if (m_pTRTHelper->barrel_ec(id)==-2) idSide =0;
else idSide=1;
- element = mgr->getEndcapElement(idSide, idLayerWheel, idStrawLayer, idPhiModule);
+ element = m_mgr->getEndcapElement(idSide, idLayerWheel, idStrawLayer, idPhiModule);
if (element == NULL) {
continue;
}
@@ -211,8 +189,8 @@ namespace LVL1 {
m_TRTStrawNeighbourSvc->getChip(strawID,i_chip);
++i_chip -= 104;
- mat_chip_endcap[idPhiModule][tempStrawNumber]=i_chip;
- mat_chip_endcap[idPhiModule+32][tempStrawNumber]=i_chip;
+ m_mat_chip_endcap[idPhiModule][tempStrawNumber]=i_chip;
+ m_mat_chip_endcap[idPhiModule+32][tempStrawNumber]=i_chip;
}
}
}
@@ -221,36 +199,36 @@ namespace LVL1 {
}
StatusCode TrigT1TRT::execute() {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "execute()" << endmsg;
+ ATH_MSG_DEBUG( "execute()" );
StatusCode sc;
std::string containerName;
- int m_barrel_trigger_board[2][32][9];
- int m_endcap_trigger_board[2][32][20];
+ int barrel_trigger_board[2][32][9];
+ int endcap_trigger_board[2][32][20];
// empty board score board
for (int i=0; i<2; i++) {
for (int j=0; j<32; j++) {
for (int k=0; k<9; k++) {
- m_barrel_trigger_board[i][j][k] = 0;
+ barrel_trigger_board[i][j][k] = 0;
}
for (int k=0; k<20; k++) {
- m_endcap_trigger_board[i][j][k] = 0;
+ endcap_trigger_board[i][j][k] = 0;
}
}
}
- int m_barrel_trigger_ttc[2][8];
- int m_endcap_trigger_ttc[2][16];
+ int barrel_trigger_ttc[2][8];
+ int endcap_trigger_ttc[2][16];
// empty board score board
for (int i=0; i<2; i++) {
for (int j=0; j<8; j++) {
- m_barrel_trigger_ttc[i][j] = 0;
+ barrel_trigger_ttc[i][j] = 0;
}
for (int j=0; j<16; j++) {
- m_endcap_trigger_ttc[i][j] = 0;
+ endcap_trigger_ttc[i][j] = 0;
}
}
@@ -259,13 +237,12 @@ namespace LVL1 {
m_TRTRDO = 0;
sc = evtStore()->retrieve( m_TRTRDO, containerName);
if( sc.isFailure() || !m_TRTRDO ) {
- if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << containerName << " not found" << endmsg;
- if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "This event will be skipped." << endmsg;
+ ATH_MSG_WARNING( containerName << " not found" );
+ ATH_MSG_WARNING( "This event will be skipped." );
return StatusCode::SUCCESS;
}
else {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << containerName << " Container Successfully Retrieved"
- << endmsg;
+ ATH_MSG_DEBUG( containerName << " Container Successfully Retrieved" );
}
// Loop over all Lvl 1 TRT hits
@@ -285,46 +262,46 @@ namespace LVL1 {
// Loop over TRT RDOs
for(p_rdo=TRT_Collection->begin(); p_rdo!=TRT_Collection->end(); ++p_rdo) {
TRT_Identifier = (*p_rdo)->identify();
- int m_barrel_ec = m_pTRTHelper->barrel_ec(TRT_Identifier);
+ int barrel_ec = m_pTRTHelper->barrel_ec(TRT_Identifier);
const TRT_LoLumRawData* p_lolum=dynamic_cast<const TRT_LoLumRawData*>(*p_rdo);
if(!p_lolum) continue;
//Get TRT Identifier (need to know phi module, module layer, straw layer, and straw # with in the layer, to get proper straw numbering.
TRT_Identifier = (p_lolum)->identify();
- int m_phi_module = m_pTRTHelper->phi_module(TRT_Identifier);
- int m_layer_or_wheel = m_pTRTHelper->layer_or_wheel(TRT_Identifier);
- int m_straw_layer = m_pTRTHelper->straw_layer(TRT_Identifier);
- int m_straw = m_pTRTHelper->straw(TRT_Identifier);
- int m_strawNumber = 0;
- int m_chip = 0;
- int m_board = 0;
+ int phi_module = m_pTRTHelper->phi_module(TRT_Identifier);
+ int layer_or_wheel = m_pTRTHelper->layer_or_wheel(TRT_Identifier);
+ int straw_layer = m_pTRTHelper->straw_layer(TRT_Identifier);
+ int straw = m_pTRTHelper->straw(TRT_Identifier);
+ int strawNumber = 0;
+ int chip = 0;
+ int board = 0;
- if (m_barrel_ec == 1 || m_barrel_ec == -1) {
+ if (barrel_ec == 1 || barrel_ec == -1) {
- int m_side = m_barrel_ec>0?1:0;
- m_strawNumber = BarrelStrawNumber(m_straw, m_straw_layer, m_layer_or_wheel);
- m_chip = mat_chip_barrel[m_phi_module][m_strawNumber];
- m_board = BarrelChipToBoard(m_chip);
- if (m_board < 0) {
- if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failure in BarrelChipToBoard" << endmsg;
+ int side = barrel_ec>0?1:0;
+ strawNumber = BarrelStrawNumber(straw, straw_layer, layer_or_wheel);
+ chip = m_mat_chip_barrel[phi_module][strawNumber];
+ board = BarrelChipToBoard(chip);
+ if (board < 0) {
+ ATH_MSG_FATAL( "Failure in BarrelChipToBoard" );
return StatusCode::FAILURE;
}
if ((p_lolum)->trailingEdge() - (p_lolum)->driftTimeBin() > 4 ) {
- m_barrel_trigger_board[m_side][m_phi_module][m_board]++;
+ barrel_trigger_board[side][phi_module][board]++;
}
- } else if (m_barrel_ec == 2 || m_barrel_ec == -2) {
+ } else if (barrel_ec == 2 || barrel_ec == -2) {
- int m_side = m_barrel_ec>0?1:0;
- m_strawNumber = EndcapStrawNumber(m_straw, m_straw_layer, m_layer_or_wheel, m_phi_module, m_barrel_ec);
- m_chip = mat_chip_endcap[m_phi_module][m_strawNumber];
- m_board = EndcapChipToBoard(m_chip);
+ int side = barrel_ec>0?1:0;
+ strawNumber = EndcapStrawNumber(straw, straw_layer, layer_or_wheel, phi_module, barrel_ec);
+ chip = m_mat_chip_endcap[phi_module][strawNumber];
+ board = EndcapChipToBoard(chip);
if ((p_lolum)->trailingEdge() - (p_lolum)->driftTimeBin() > 4 ) {
- m_endcap_trigger_board[m_side][m_phi_module][m_board]++;
+ endcap_trigger_board[side][phi_module][board]++;
}
}
@@ -336,13 +313,13 @@ namespace LVL1 {
for (int i=0; i<2; i++) {
for (int j=0; j<32; j++) {
for (int k=0; k<9; k++) {
- if (m_barrel_trigger_board[i][j][k] >= m_BoardMultiplicity) {
- m_barrel_trigger_ttc[i][j%4]++;
+ if (barrel_trigger_board[i][j][k] >= m_BoardMultiplicity) {
+ barrel_trigger_ttc[i][j%4]++;
}
}
for (int k=0; k<20; k++) {
- if (m_endcap_trigger_board[i][j][k] >= m_BoardMultiplicity) {
- m_endcap_trigger_ttc[i][j%2]++;
+ if (endcap_trigger_board[i][j][k] >= m_BoardMultiplicity) {
+ endcap_trigger_ttc[i][j%2]++;
}
}
}
@@ -353,35 +330,29 @@ namespace LVL1 {
// analyse ttc score board - fill ttc score board
for (int i=0; i<2; i++) {
for (int j=0; j<8; j++) {
- if (m_barrel_trigger_ttc[i][j] >= m_TTCMultiplicity) {
+ if (barrel_trigger_ttc[i][j] >= m_TTCMultiplicity) {
cableWord0 = 1 << m_cablestarts[0];
}
}
for (int j=0; j<16; j++) {
- if (m_endcap_trigger_ttc[i][j] >= m_TTCMultiplicity) {
+ if (endcap_trigger_ttc[i][j] >= m_TTCMultiplicity) {
cableWord0 = 1 << m_cablestarts[0];
}
}
}
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " cableWord: " << cableWord0 << endmsg;
+ ATH_MSG_DEBUG( " cableWord: " << cableWord0 );
// Record the CTP trigger word in StoreGate.
TrtCTP *trtCTP = new TrtCTP(cableWord0);
containerName = DEFAULT_TrtCTPLocation;
- if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "returning "<< trtCTP->dump() << endmsg;
- if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << trtCTP->print() << endmsg;
+ ATH_MSG_VERBOSE( "returning "<< trtCTP->dump() );
+ ATH_MSG_VERBOSE( trtCTP->print() );
- sc = evtStore()->record(trtCTP, containerName, false);
- if(sc.isFailure()) {
- if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Failed to register " << containerName << endmsg;
- return StatusCode::FAILURE;
- }
- else {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << containerName << " registered successfully " << endmsg;
- }
-
+ ATH_CHECK( evtStore()->record(trtCTP, containerName, false) );
+ ATH_MSG_DEBUG( containerName << " registered successfully " );
+
return StatusCode::SUCCESS;
}
@@ -500,8 +471,8 @@ namespace LVL1 {
do {
i++;
- addToStrawNumber+=numberOfStraws[i-1];
- addToStrawNumberNext = addToStrawNumber+numberOfStraws[i];
+ addToStrawNumber+=m_numberOfStraws[i-1];
+ addToStrawNumberNext = addToStrawNumber+m_numberOfStraws[i];
}
while(BarrelStrawLayerNumber(strawlayerNumber,LayerNumber)!=i-1);
/*