#include "AliPHOSv1.h"
#include "AliPHOSHit.h"
-#include "AliPHOSDigit.h"
-#include "AliPHOSReconstructioner.h"
+#include "AliPHOSCPVDigit.h"
#include "AliRun.h"
#include "AliConst.h"
#include "AliMC.h"
+#include "AliPHOSGeometry.h"
+#include "AliQAIntCheckable.h"
+#include "AliQAFloatCheckable.h"
+#include "AliQAMeanChecker.h"
ClassImp(AliPHOSv1)
//____________________________________________________________________________
-AliPHOSv1::AliPHOSv1()
+AliPHOSv1::AliPHOSv1():
+AliPHOSv0()
{
// ctor
-
- // Create an empty array of AliPHOSCPVModule to satisfy
- // AliPHOSv1::Streamer when reading root file
-
- fReconstructioner = 0;
- fTrackSegmentMaker = 0;
-
- fHits = new TClonesArray("AliPHOSHit",1000) ;
- // if ( 0==(fEMCModules=new TClonesArray("AliPHOSCPVModule",0)) ) {
- // Error("AliPHOSv1","Can not create array of EMC modules");
- // exit(1);
- // }
-
- // if ( 0==(fCPVModules=new TClonesArray("AliPHOSCPVModule",0)) ) {
- // Error("AliPHOSv1","Can not create array of CPV modules");
- // exit(1);
- // }
-
}
//____________________________________________________________________________
// (this array is reset after each primary has been tracked).
//
- fPinElectronicNoise = 0.010 ;
- fDigitThreshold = 0.01 ; // 1 GeV
- fDigitizeA= 0. ;
- fDigitizeB = 10000000. ;
// We do not want to save in TreeH the raw hits
fNhits = 0 ;
- fReconstructioner = 0;
- fTrackSegmentMaker = 0;
-
fIshunt = 1 ; // All hits are associated with primary particles
- // Create array of EMC modules of the size of PHOS modules number
-
-// if ( 0==(fEMCModules=new TClonesArray("AliPHOSCPVModule",fGeom->GetNModules())) ) {
-// Error("AliPHOSv1","Can not create array of EMC modules");
-// exit(1);
-// }
-// TClonesArray &lemcmodule = *fEMCModules;
-// for (Int_t i=0; i<fGeom->GetNModules(); i++) new(lemcmodule[i]) AliPHOSCPVModule();
-
- // Create array of CPV modules for the IHEP's version of CPV
-
-// if ( strcmp(fGeom->GetName(),"IHEP") == 0 || strcmp(fGeom->GetName(),"MIXT") == 0 ) {
-// // Create array of CPV modules of the size of PHOS modules number
-
-// if ( 0==(fCPVModules=new TClonesArray("AliPHOSCPVModule",fGeom->GetNCPVModules())) ) {
-// Error("AliPHOSv1","Can not create array of CPV modules");
-// exit(1);
-// }
-// TClonesArray &lcpvmodule = *fCPVModules;
-// for (Int_t i=0; i<fGeom->GetNCPVModules(); i++) new(lcpvmodule[i]) AliPHOSCPVModule();
-// }
-// else {
-// // Create an empty array of AliPHOSCPVModule to satisfy
-// // AliPHOSv1::Streamer when writing root file
-
-// fCPVModules=new TClonesArray("AliPHOSCPVModule",0);
-
-// }
-}
-
-//____________________________________________________________________________
-AliPHOSv1::AliPHOSv1(AliPHOSReconstructioner * Reconstructioner, const char *name, const char *title):
- AliPHOSv0(name,title)
-{
- // ctor : title is used to identify the layout
- // GPS2 = 5 modules (EMC + PPSD)
- // We use 2 arrays of hits :
- //
- // - fHits (the "normal" one), which retains the hits associated with
- // the current primary particle being tracked
- // (this array is reset after each primary has been tracked).
- //
- // - fTmpHits, which retains all the hits of the current event. It
- // is used for the digitization part.
-
- fPinElectronicNoise = 0.010 ;
-
- // We do not want to save in TreeH the raw hits
- //fHits = new TClonesArray("AliPHOSHit",100) ;
-
- fDigits = 0 ;
- fHits= new TClonesArray("AliPHOSHit",1000) ;
-
- fNhits = 0 ;
-
- fIshunt = 1 ; // All hits are associated with primary particles
-
- // gets an instance of the geometry parameters class
- fGeom = AliPHOSGeometry::GetInstance(title, "") ;
-
- if (fGeom->IsInitialized() )
- cout << "AliPHOS" << Version() << " : PHOS geometry intialized for " << fGeom->GetName() << endl ;
- else
- cout << "AliPHOS" << Version() << " : PHOS geometry initialization failed !" << endl ;
-
- // Defining the PHOS Reconstructioner
-
- fReconstructioner = Reconstructioner ;
-
}
//____________________________________________________________________________
delete fHits ;
fHits = 0 ;
}
-
- if ( fSDigits) {
- fSDigits->Delete() ;
- delete fSDigits ;
- fSDigits = 0 ;
- }
-
- if ( fDigits) {
- fDigits->Delete() ;
- delete fDigits ;
- fDigits = 0 ;
- }
-
- if ( fEmcRecPoints ) {
- fEmcRecPoints->Delete() ;
- delete fEmcRecPoints ;
- fEmcRecPoints = 0 ;
- }
-
- if ( fPpsdRecPoints ) {
- fPpsdRecPoints->Delete() ;
- delete fPpsdRecPoints ;
- fPpsdRecPoints = 0 ;
- }
-
- if ( fTrackSegments ) {
- fTrackSegments->Delete() ;
- delete fTrackSegments ;
- fTrackSegments = 0 ;
- }
-
}
//____________________________________________________________________________
-void AliPHOSv1::AddHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t Id, Float_t * hits, Int_t trackpid, TLorentzVector p, Float_t * lpos)
+void AliPHOSv1::AddHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t Id, Float_t * hits)
{
// Add a hit to the hit list.
// A PHOS hit is the sum of all hits in a single crystal
AliPHOSHit *curHit ;
Bool_t deja = kFALSE ;
- newHit = new AliPHOSHit(shunt, primary, tracknumber, Id, hits, trackpid, p, lpos) ;
+ newHit = new AliPHOSHit(shunt, primary, tracknumber, Id, hits) ;
- for ( hitCounter = 0 ; hitCounter < fNhits && !deja ; hitCounter++ ) {
+ for ( hitCounter = fNhits-1 ; hitCounter >= 0 && !deja ; hitCounter-- ) {
curHit = (AliPHOSHit*) (*fHits)[hitCounter] ;
+ if(curHit->GetPrimary() != primary) break ; // We add hits with the same primary, while GEANT treats primaries consequently
if( *curHit == *newHit ) {
*curHit = *curHit + *newHit ;
deja = kTRUE ;
}
//____________________________________________________________________________
-void AliPHOSv1::Hits2SDigits(){
- //Collects all hits in the same active volume into digit
-
- Int_t i ;
- Int_t j ;
- AliPHOSHit * hit ;
- AliPHOSDigit * newdigit ;
- AliPHOSDigit * curdigit ;
- Bool_t deja = kFALSE ;
-
-
- Int_t itrack ;
- for (itrack=0; itrack<gAlice->GetNtrack(); itrack++){
-
- //=========== Get the Hits Tree for the Primary track itrack
- gAlice->ResetHits();
- gAlice->TreeH()->GetEvent(itrack);
-
-
- for ( i = 0 ; i < fHits->GetEntries() ; i++ ) {
- hit = (AliPHOSHit*)fHits->At(i) ;
-
- // Assign primary number only if contribution is significant
- if( hit->GetEnergy() > fDigitThreshold)
- newdigit = new AliPHOSDigit( hit->GetPrimary(), hit->GetId(), Digitize( hit->GetEnergy() ) ) ;
- else
- newdigit = new AliPHOSDigit( -1 , hit->GetId(), Digitize( hit->GetEnergy() ) ) ;
- deja =kFALSE ;
-
- for ( j = 0 ; j < fnSdigits ; j++) {
- curdigit = (AliPHOSDigit*) fSDigits->At(j) ;
- if ( *curdigit == *newdigit) {
- *curdigit = *curdigit + *newdigit ;
- deja = kTRUE ;
- }
- }
-
- if ( !deja ) {
- new((*fSDigits)[fnSdigits]) AliPHOSDigit(* newdigit) ;
- fnSdigits++ ;
- }
-
- delete newdigit ;
- }
-
- } // loop over tracks
-
- fSDigits->Sort() ;
-
- fnSdigits = fSDigits->GetEntries() ;
- fSDigits->Expand(fnSdigits) ;
-
- for (i = 0 ; i < fnSdigits ; i++) {
- AliPHOSDigit * digit = (AliPHOSDigit *) fSDigits->At(i) ;
- digit->SetIndexInList(i) ;
- }
-
- gAlice->TreeS()->Fill() ;
-
- TTree *ts = gAlice->TreeS();
- TDirectory *dir = ts->GetDirectory() ;
- cout << "dir name is " << dir->GetName() << endl ;
- // ts->Write(0,TObject::kOverwrite) ;
-
-gAlice->TreeS()->GetBranch("PHOS")->Fill();
-gAlice->TreeS()->GetBranch("PHOS")->Write();
+void AliPHOSv1::FinishPrimary()
+{
+ // called at the end of each track (primary) by AliRun
+ // hits are reset for each new track
+ // accumulate the total hit-multiplicity
+ if ( fQAHitsMul )
+ fQAHitsMul->Update( fHits->GetEntriesFast() ) ;
}
-//____________________________________________________________________________
-void AliPHOSv1::SDigits2Digits(){
- //Adds noise to the summable digits and removes everething below thresholds
- //Note, that sDigits should be SORTED in accordance with abs ID.
-
-
- gAlice->TreeS()->GetEvent(0) ;
-
- cout << "fSdigits " << fSDigits << " " << fSDigits->GetEntries() << endl ;
-
-
- // Noise induced by the PIN diode of the PbWO crystals
- Int_t iCurSDigit = 0 ;
- //we assume, that there is al least one EMC digit...
- Int_t idCurSDigit = ((AliPHOSDigit *)fSDigits->At(0))->GetId() ;
-
- cout << "fDigits " << fDigits << " " <<idCurSDigit<< endl ;
-
- Int_t absID ;
- for(absID = 1; absID < fGeom->GetNModules()*fGeom->GetNPhi()*fGeom->GetNZ(); absID++){
-
- cout << "absID " << absID << " " << idCurSDigit << endl ;
-
- Float_t noise = gRandom->Gaus(0., fPinElectronicNoise) ;
- if(absID < idCurSDigit ){
- cout << "In < idC " << noise << " " << fDigitThreshold << endl ;
- if(noise >fDigitThreshold ){
- cout << "noise " << absID << " " << noise << endl;
- new((*fDigits)[fNdigits]) AliPHOSDigit( -1,absID,Digitize(noise) ) ;
- cout << "FN " << fNdigits << endl ;
- fNdigits++ ;
- }
- }
- else{ //add noise and may be remove the true hit
- cout << "correcting digit " << iCurSDigit << endl ;
- Float_t signal = noise + Calibrate(((AliPHOSDigit *)fSDigits->At(iCurSDigit))->GetAmp()) ;
- cout << "signal " << signal << endl ;
- if( signal >fDigitThreshold ){
- cout << "signal " << signal << endl ;
- AliPHOSDigit * digit = (AliPHOSDigit*) fSDigits->At(iCurSDigit) ;
- new((*fDigits)[fNdigits]) AliPHOSDigit( *digit ) ;
- ((AliPHOSDigit *)fDigits->At(fNdigits))->SetAmp(Digitize(signal));
- cout << "fNdigits " << fNdigits << endl ;
- fNdigits++ ;
- }
- if(iCurSDigit < fSDigits->GetEntries()-1){
- iCurSDigit++ ;
- idCurSDigit = ((AliPHOSDigit*)fSDigits->At(iCurSDigit))->GetId() ;
- }
- else
- idCurSDigit = 10000000; //no real hits left
- }
-
- }
-
- //remove PPSD/CPV digits below thresholds
- Int_t idigit ;
- for(idigit = iCurSDigit; idigit < fSDigits->GetEntries() ; idigit++){ //loop over CPV/PPSD digits
-
- AliPHOSDigit * digit = (AliPHOSDigit *) fSDigits->At(idigit) ;
- Float_t ene = Calibrate(digit->GetAmp()) ;
-
- Int_t relid[4] ;
- fGeom->AbsToRelNumbering(digit->GetId(), relid) ;
- if ( relid[0] > fGeom->GetNCPVModules() ){ //ppsd
- if ( ( (relid[1] > 0) && (ene > fPpsdEnergyThreshold)) || //PPSD digit
- ( (relid[1] < 0) && (ene > fCpvEnergyThreshold ) ) ) //CPV digit
- new((*fDigits)[fNdigits]) AliPHOSDigit( *digit ) ;
- fNdigits++ ;
+//____________________________________________________________________________
+void AliPHOSv1::FinishEvent()
+{
+ // called at the end of each event by AliRun
+ // accumulate the hit-multiplicity and total energy per block
+ // if the values have been updated check it
+
+ if ( fQATotEner ) {
+ if ( fQATotEner->HasChanged() ) {
+ fQATotEner->CheckMe() ;
+ fQATotEner->Reset() ;
}
- }
-
- fDigits->Compress() ;
-
- fNdigits = fDigits->GetEntries() ;
- fDigits->Expand(fNdigits) ;
-
- Int_t i ;
- for (i = 0 ; i < fNdigits ; i++) {
- AliPHOSDigit * digit = (AliPHOSDigit *) fDigits->At(i) ;
- digit->SetIndexInList(i) ;
- }
-
-
- gAlice->TreeD()->Fill() ;
-
- gAlice->TreeD()->Write(0,TObject::kOverwrite) ;
-
-}
-
-//___________________________________________________________________________
-void AliPHOSv1::MakeBranch(Option_t* opt, char *file)
-{
-
-
- char *cH ;
- // Create new branche in the current Root Tree in the digit Tree
- AliDetector::MakeBranch(opt) ;
-
-
- cH = strstr(opt,"S");
- //Create a branch for SDigits
- if( cH ){
- char branchname[20];
- sprintf(branchname,"%s",GetName());
- if(fSDigits)
- fSDigits->Clear();
- else
- fSDigits = new TClonesArray("AliPHOSDigit",1000);
- fnSdigits = 0 ;
- cout << " AliPHOSv1::MakeBranch : " << file << endl ;
- gAlice->MakeBranchInTree(gAlice->TreeS(),branchname,&fSDigits,fBufferSize,file);
}
- cH = strstr(opt,"D");
- //Create a branch for Digits
- if( cH ){
- char branchname[20];
- sprintf(branchname,"%s",GetName());
- if(fSDigits)
- fDigits->Clear();
- else
- fDigits = new TClonesArray("AliPHOSDigit",1000);
- fNdigits = 0 ;
-
- gAlice->MakeBranchInTree(gAlice->TreeD(),branchname,&fSDigits,fBufferSize,file);
- }
-
- cH = strstr(opt,"R");
- //Create a branch for Reconstruction
- if( cH ){
- char branchname[20];
-
- Int_t splitlevel = 0 ;
-
- fEmcRecPoints->Delete() ;
-
- if ( fEmcRecPoints && gAlice->TreeR() ) {
- sprintf(branchname,"%sEmcRP",GetName()) ;
- gAlice->TreeR()->Branch(branchname, "TObjArray", &fEmcRecPoints, fBufferSize, splitlevel) ;
- }
-
- fPpsdRecPoints->Delete() ;
-
- if ( fPpsdRecPoints && gAlice->TreeR() ) {
- sprintf(branchname,"%sPpsdRP",GetName()) ;
- gAlice->TreeR()->Branch(branchname, "TObjArray", &fPpsdRecPoints, fBufferSize, splitlevel) ;
- }
-
- fTrackSegments->Delete() ;
-
- if ( fTrackSegments && gAlice->TreeR() ) {
- sprintf(branchname,"%sTS",GetName()) ;
- gAlice->TreeR()->Branch(branchname, &fTrackSegments, fBufferSize) ;
- }
-
- fRecParticles->Delete() ;
-
- if ( fRecParticles && gAlice->TreeR() ) {
- sprintf(branchname,"%sRP",GetName()) ;
- gAlice->TreeR()->Branch(branchname, &fRecParticles, fBufferSize) ;
- }
-
+ Int_t i ;
+ if ( fQAHitsMulB && fQATotEnerB ) {
+ for (i = 0 ; i < fGeom->GetNModules() ; i++) {
+ AliQAIntCheckable * ci = (AliQAIntCheckable*)(*fQAHitsMulB)[i] ;
+ AliQAFloatCheckable* cf = (AliQAFloatCheckable*)(*fQATotEnerB)[i] ;
+ if ( ci->HasChanged() ) {
+ ci->CheckMe() ;
+ ci->Reset() ;
+ }
+ if ( cf->HasChanged() ) {
+ cf->CheckMe() ;
+ cf->Reset() ;
+ }
+ }
}
-
-
-
-}
-
-//_____________________________________________________________________________
-void AliPHOSv1::Reconstruction(AliPHOSReconstructioner * Reconstructioner)
-{
- // 1. Reinitializes the existing RecPoint, TrackSegment, and RecParticles Lists and
- // 2. Creates TreeR with a branch for each list
- // 3. Steers the reconstruction processes
- // 4. Saves the 3 lists in TreeR
- // 5. Write the Tree to File
- fReconstructioner = Reconstructioner ;
-
- // 1.
-
- // gAlice->MakeTree("R") ;
-
- MakeBranch("R") ;
+ // check the total multiplicity
- // 3.
-
- fReconstructioner->Make(fDigits, fEmcRecPoints, fPpsdRecPoints, fTrackSegments, fRecParticles);
-
- printf("Reconstruction: %d %d %d %d\n",
- fEmcRecPoints->GetEntries(),fPpsdRecPoints->GetEntries(),
- fTrackSegments->GetEntries(),fRecParticles->GetEntries());
-
- // 4. Expand or Shrink the arrays to the proper size
-
- Int_t size ;
-
- size = fEmcRecPoints->GetEntries() ;
- fEmcRecPoints->Expand(size) ;
-
- size = fPpsdRecPoints->GetEntries() ;
- fPpsdRecPoints->Expand(size) ;
-
- size = fTrackSegments->GetEntries() ;
- fTrackSegments->Expand(size) ;
-
- size = fRecParticles->GetEntries() ;
- fRecParticles->Expand(size) ;
-
- gAlice->TreeR()->Fill() ;
- // 5.
-
- gAlice->TreeR()->Write(0,TObject::kOverwrite) ;
-
- // Deleting reconstructed objects
- ResetReconstruction();
-
-}
-
-//____________________________________________________________________________
-void AliPHOSv1::ResetHits()
-{
- // Reset hit tree for EMC and CPV
- // Yuri Kharlov, 28 September 2000
-
- AliDetector::ResetHits();
- // for (Int_t i=0; i<fGeom->GetNModules(); i++) ((AliPHOSCPVModule*)(*fEMCModules)[i]) -> Clear();
- // if ( strcmp(fGeom->GetName(),"IHEP") == 0 || strcmp(fGeom->GetName(),"MIXT") == 0 ) {
- // for (Int_t i=0; i<fGeom->GetNCPVModules(); i++) ((AliPHOSCPVModule*)(*fCPVModules)[i]) -> Clear();
- // }
-
-}
-//____________________________________________________________________________
-void AliPHOSv1::ResetReconstruction()
-{
- // Deleting reconstructed objects
-
- if ( fEmcRecPoints ) fEmcRecPoints ->Delete();
- if ( fPpsdRecPoints ) fPpsdRecPoints->Delete();
- if ( fTrackSegments ) fTrackSegments->Delete();
- if ( fRecParticles ) fRecParticles ->Delete();
-
-}
-
-//____________________________________________________________________________
-//void AliPHOSv1::SDigits2Digits() {
-// // Adds the noise to the summable digits and keeps digits above a threshold
-// // To make a digit
-//}
-
-//____________________________________________________________________________
-void AliPHOSv1::SetTreeAddress()
-{
- // TBranch *branch;
- AliPHOS::SetTreeAddress();
-
-// //Branch address for TreeR: RecPpsdRecPoint
-// TTree *treeR = gAlice->TreeR();
-// if ( treeR && fPpsdRecPoints ) {
-// branch = treeR->GetBranch("PHOSPpsdRP");
-// if (branch) branch->SetAddress(&fPpsdRecPoints) ;
-// }
-
- // Set branch address for the Hits Tree for hits in EMC modules
- // Yuri Kharlov, 23 November 2000.
-
- // for( Int_t i=0; i<fGeom->GetNModules(); i++ ) GetEMCModule(i).SetTreeAddress("EMC",i+1);
-
- // Set branch address for the Hits Tree for hits in CPV modules for IHEP geometry
- // Yuri Kharlov, 28 September 2000.
-
- // if ( strcmp(fGeom->GetName(),"IHEP") == 0 || strcmp(fGeom->GetName(),"MIXT") == 0 ) {
- // for( Int_t i=0; i<fGeom->GetNCPVModules(); i++ ) GetCPVModule(i).SetTreeAddress("CPV",i+1);
- // }
-
+ if ( fQAHitsMul ) {
+ if ( fQAHitsMul->HasChanged() ) {
+ fQAHitsMul->CheckMe() ;
+ fQAHitsMul->Reset() ;
+ }
+ }
}
//____________________________________________________________________________
-
void AliPHOSv1::StepManager(void)
{
// Accumulates hits as long as the track stays in a single crystal or PPSD gas Cell
-// if (gMC->IsTrackEntering())
-// cout << "Track enters the volume " << gMC->CurrentVolName() << endl;
-// if (gMC->IsTrackExiting())
-// cout << "Track leaves the volume " << gMC->CurrentVolName() << endl;
-
- Int_t relid[4] ; // (box, layer, row, column) indices
- Int_t absid ; // absolute cell ID number
+ Int_t relid[4] ; // (box, layer, row, column) indices
+ Int_t absid ; // absolute cell ID number
Float_t xyze[4]={0,0,0,0} ; // position wrt MRS and energy deposited
- TLorentzVector pos ; // Lorentz vector of the track current position
- TLorentzVector pmom ; //momentum of the particle initiated hit
- Float_t xyd[2] ; //local posiiton of the entering
- Bool_t entered = kFALSE ;
+ TLorentzVector pos ; // Lorentz vector of the track current position
Int_t copy ;
Int_t tracknumber = gAlice->CurrentTrack() ;
Int_t primary = gAlice->GetPrimary( gAlice->CurrentTrack() );
TString name = fGeom->GetName() ;
- Int_t trackpid = 0 ;
-
- if( gMC->IsTrackEntering() ){ // create hit with position and momentum of new particle,
- // but may be without energy deposition
-
- // Current position of the hit in the local ref. system
- gMC -> TrackPosition(pos);
- Float_t xyzm[3], xyzd[3] ;
- Int_t i;
- for (i=0; i<3; i++) xyzm[i] = pos[i];
- gMC -> Gmtod (xyzm, xyzd, 1); // transform coordinate from master to daughter system
- xyd[0] = xyzd[0];
- xyd[1] =-xyzd[2];
-
- // Current momentum of the hit's track in the local ref. system
- gMC -> TrackMomentum(pmom);
- Float_t pm[3], pd[3];
- for (i=0; i<3; i++) pm[i] = pmom[i];
- gMC -> Gmtod (pm, pd, 2); // transform 3-momentum from master to daughter system
- pmom[0] = pd[0];
- pmom[1] =-pd[1];
- pmom[2] =-pd[2];
-
- trackpid = gMC->TrackPid();
- entered = kTRUE ; // Mark to create hit even withou energy deposition
-
- }
if ( name == "GPS2" || name == "MIXT" ) { // ======> CPV is a GPS' PPSD
- if( gMC->CurrentVolID(copy) == gMC->VolId("GCEL") ) // We are inside a gas cell
+ if( gMC->CurrentVolID(copy) == gMC->VolId("PPCE") ) // We are inside a gas cell
{
gMC->TrackPosition(pos) ;
xyze[0] = pos[0] ;
xyze[2] = pos[2] ;
xyze[3] = gMC->Edep() ;
- if ( (xyze[3] != 0) || entered ) { // there is deposited energy or new particle entering PPSD
+ if ( xyze[3] != 0 ) { // there is deposited energy
gMC->CurrentVolOffID(5, relid[0]) ; // get the PHOS Module number
if ( name == "MIXT" && strcmp(gMC->CurrentVolOffName(5),"PHO1") == 0 ){
relid[0] += fGeom->GetNModules() - fGeom->GetNPPSDModules();
fGeom->RelToAbsNumbering(relid, absid) ;
// add current hit to the hit list
- AddHit(fIshunt, primary, tracknumber, absid, xyze, trackpid, pmom, xyd);
+ AddHit(fIshunt, primary, tracknumber, absid, xyze);
} // there is deposited energy
// Yuri Kharlov, 28 September 2000
- if( gMC->CurrentVolID(copy) == gMC->VolId("CPVQ") &&
- entered &&
+ if( gMC->CurrentVolID(copy) == gMC->VolId("PCPQ") &&
+ (gMC->IsTrackEntering() ) &&
gMC->TrackCharge() != 0) {
+ gMC -> TrackPosition(pos);
+ Float_t xyzm[3], xyzd[3] ;
+ Int_t i;
+ for (i=0; i<3; i++) xyzm[i] = pos[i];
+ gMC -> Gmtod (xyzm, xyzd, 1); // transform coordinate from master to daughter system
+
+ Float_t xyd[3]={0,0,0} ; //local posiiton of the entering
+ xyd[0] = xyzd[0];
+ xyd[1] =-xyzd[1];
+ xyd[2] =-xyzd[2];
+
+
+ // Current momentum of the hit's track in the local ref. system
+ TLorentzVector pmom ; //momentum of the particle initiated hit
+ gMC -> TrackMomentum(pmom);
+ Float_t pm[3], pd[3];
+ for (i=0; i<3; i++) pm[i] = pmom[i];
+ gMC -> Gmtod (pm, pd, 2); // transform 3-momentum from master to daughter system
+ pmom[0] = pd[0];
+ pmom[1] =-pd[1];
+ pmom[2] =-pd[2];
+
// Digitize the current CPV hit:
// 1. find pad response and
xyze[2] = 0. ;
xyze[3] = cpvDigit->GetQpad() ; // amplitude in a pad
primary = -1; // No need in primary for CPV
- AddHit(fIshunt, primary, tracknumber, absid, xyze, trackpid, pmom, xyd);
+ AddHit(fIshunt, primary, tracknumber, absid, xyze);
if (cpvDigit->GetQpad() > 0.02) {
xmean += cpvDigit->GetQpad() * (cpvDigit->GetXpad() + 0.5);
xyze[3] = gMC->Edep() ;
- if ( (xyze[3] != 0) || entered ) { // Track is inside the crystal and deposits some energy or just entered
+ if ( xyze[3] != 0 ) { // Track is inside the crystal and deposits some energy
gMC->CurrentVolOffID(10, relid[0]) ; // get the PHOS module number ;
fGeom->RelToAbsNumbering(relid, absid) ;
// add current hit to the hit list
- AddHit(fIshunt, primary,tracknumber, absid, xyze, trackpid,pmom, xyd);
+ AddHit(fIshunt, primary,tracknumber, absid, xyze);
} // there is deposited energy
} // we are inside a PHOS Xtal
-
-
}
//____________________________________________________________________________
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff