Fork me on GitHub

Changeset 1235 in svn for trunk


Ignore:
Timestamp:
Jul 22, 2013, 10:00:23 PM (11 years ago)
Author:
Pavel Demin
Message:

new energy flow that compiles

Location:
trunk/modules
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/modules/Calorimeter.cc

    r1233 r1235  
    4545  fTowerECalArray(0), fItTowerECalArray(0),
    4646  fTowerHCalArray(0), fItTowerHCalArray(0),
     47  fTowerTrackArray(0), fItTowerTrackArray(0),
    4748  fTowerECalTrackArray(0), fItTowerECalTrackArray(0),
    4849  fTowerHCalTrackArray(0), fItTowerHCalTrackArray(0)
    … …  
    5657  fItTowerHCalArray = fTowerHCalArray->MakeIterator();
    5758
     59  fTowerTrackArray = new TObjArray;
     60  fItTowerTrackArray = fTowerTrackArray->MakeIterator();
    5861  fTowerECalTrackArray = new TObjArray;
    5962  fItTowerECalTrackArray = fTowerECalTrackArray->MakeIterator();
    … …  
    7477  if(fItTowerHCalArray) delete fItTowerHCalArray;
    7578
     79  if(fTowerTrackArray) delete fTowerTrackArray;
     80  if(fItTowerTrackArray) delete fItTowerTrackArray;
    7681  if(fTowerECalTrackArray) delete fTowerECalTrackArray;
    7782  if(fItTowerECalTrackArray) delete fItTowerECalTrackArray;
    … …  
    352357      fTowerHCalTrackHits = 0;
    353358
     359      fTowerECalArray->Clear();
     360      fTowerHCalArray->Clear();
     361
     362      fTowerTrackArray->Clear();
    354363      fTowerECalTrackArray->Clear();
    355364      fTowerHCalTrackArray->Clear();
    356       fTowerECalArray->Clear();
    357       fTowerHCalArray->Clear();
    358365    }
    359366
    … …  
    365372      ++fTowerTrackAllHits;
    366373      fTowerTrackArray->Add(track);
     374
     375      // check for track ECAL hits
    367376      if(flags & 2)
    368377      {
    … …  
    370379        fTowerECalTrackArray->Add(track);
    371380      }
     381
     382      // check for track HCAL hits
    372383      if(flags & 4)
    373384      {
    … …  
    379390
    380391    ++fTowerAllHits;
    381 
    382     // check for ECAL hits in current tower
     392    fTower->AddCandidate(particle);
     393
     394    // check for ECAL hits
    383395    if(flags & 2)
    384396    {
    … …  
    387399    }
    388400
    389     // check for HCAL hits in current tower
     401    // check for HCAL hits
    390402    if(flags & 4)
    391403    {
    … …  
    406418    fTowerECalEnergy += ecalEnergy;
    407419    fTowerHCalEnergy += hcalEnergy;
    408 
    409     fTower->AddCandidate(particle);
    410420  }
    411421

  • trunk/modules/Calorimeter.h

    r1233 r1235  
    7474  TObjArray *fEFlowTowerOutputArray; //!
    7575
     76  TObjArray *fTowerECalArray; //!
     77  TIterator *fItTowerECalArray; //!
     78
     79  TObjArray *fTowerHCalArray; //!
     80  TIterator *fItTowerHCalArray; //!
     81
     82  TObjArray *fTowerTrackArray; //!
     83  TIterator *fItTowerTrackArray; //!
     84
    7685  TObjArray *fTowerECalTrackArray; //!
    7786  TIterator *fItTowerECalTrackArray; //!
    … …  
    7988  TObjArray *fTowerHCalTrackArray; //!
    8089  TIterator *fItTowerHCalTrackArray; //!
    81 
    82   TObjArray *fTowerECalArray; //!
    83   TIterator *fItTowerECalArray; //!
    84 
    85   TObjArray *fTowerHCalArray; //!
    86   TIterator *fItTowerHCalArray; //!
    8790
    8891  void FinalizeTower();
Note: See TracChangeset for help on using the changeset viewer.