-
/**************************************************************************
* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
* *
// --- ROOT system ---
-#include "TROOT.h"
-#include "TFile.h"
-#include "TFolder.h"
-#include "TMath.h"
-#include "TMinuit.h"
-#include "TTree.h"
-#include "TSystem.h"
-#include "TBenchmark.h"
-
+#include <TROOT.h>
+#include <TH1.h>
+#include <TFile.h>
+#include <TFolder.h>
+#include <TMath.h>
+#include <TMinuit.h>
+#include <TTree.h>
+#include <TSystem.h>
+#include <TBenchmark.h>
+#include <TBrowser.h>
// --- Standard library ---
#include "AliEMCALDigitizer.h"
#include "AliEMCAL.h"
#include "AliEMCALGeometry.h"
+#include "AliEMCALHistoUtilities.h"
+#include "AliCDBManager.h"
+#include "AliCDBStorage.h"
+#include "AliCDBEntry.h"
ClassImp(AliEMCALClusterizerv1)
-Int_t addOn[20][60][60];
-
//____________________________________________________________________________
AliEMCALClusterizerv1::AliEMCALClusterizerv1() : AliEMCALClusterizer()
{
InitParameters() ;
fDefaultInit = kTRUE ;
- for(Int_t is=0;is<20;is++){
- for(Int_t i=0;i<60;i++){
- for(Int_t j=0;j<60;j++){
- addOn[is][i][j]=0;
- }
- }
- }
-//PH cout<<"file to read 1"<<endl;
- ReadFile();
-//PH cout<<"file read 1"<<endl;
+ fGeom = AliEMCALGeometry::GetInstance();
+ fGeom->GetTransformationForSM(); // Global <-> Local
}
//____________________________________________________________________________
InitParameters() ;
Init() ;
fDefaultInit = kFALSE ;
- for(Int_t is=0;is<20;is++){
- for(Int_t i=0;i<60;i++){
- for(Int_t j=0;j<60;j++){
- addOn[is][i][j]=0;
- }
- }
- }
-//PH cout<<"file to read 2"<<endl;
- ReadFile();
-//PH cout<<"file read 2"<<endl;
-
}
//____________________________________________________________________________
AliEMCALClusterizerv1::~AliEMCALClusterizerv1()
{
// dtor
-
}
//____________________________________________________________________________
const TString AliEMCALClusterizerv1::BranchName() const
{
return GetName();
-
}
//____________________________________________________________________________
-Float_t AliEMCALClusterizerv1::Calibrate(Int_t amp) const
+Float_t AliEMCALClusterizerv1::Calibrate(Int_t amp, Int_t AbsId)
{
- //To be replased later by the method, reading individual parameters from the database
- return -fADCpedestalECA + amp * fADCchannelECA ;
+
+ // Convert digitized amplitude into energy.
+ // Calibration parameters are taken from calibration data base for raw data,
+ // or from digitizer parameters for simulated data.
+
+ if(fCalibData){
+
+ //JLK 13-Mar-2006
+ //We now get geometry at a higher level
+ //
+ // Loader
+ // AliRunLoader *rl = AliRunLoader::GetRunLoader();
+
+ // Load EMCAL Geomtry
+ // rl->LoadgAlice();
+ //AliRun * gAlice = rl->GetAliRun();
+ //AliEMCAL * emcal = (AliEMCAL*)gAlice->GetDetector("EMCAL");
+ //AliEMCALGeometry * geom = emcal->GetGeometry();
+
+ if (fGeom==0)
+ AliFatal("Did not get geometry from EMCALLoader") ;
+
+ Int_t iSupMod = -1;
+ Int_t nTower = -1;
+ Int_t nIphi = -1;
+ Int_t nIeta = -1;
+ Int_t iphi = -1;
+ Int_t ieta = -1;
+
+ Bool_t bCell = fGeom->GetCellIndex(AbsId, iSupMod, nTower, nIphi, nIeta) ;
+ if(!bCell)
+ Error("DigitizeEnergy","Wrong cell id number") ;
+ fGeom->GetCellPhiEtaIndexInSModule(iSupMod,nTower,nIphi, nIeta,iphi,ieta);
+
+ fADCchannelECA = fCalibData->GetADCchannel (iSupMod,ieta,iphi);
+ fADCpedestalECA = fCalibData->GetADCpedestal(iSupMod,ieta,iphi);
+ return -fADCpedestalECA + amp * fADCchannelECA ;
+
+ }
+ else //Return energy with default parameters if calibration is not available
+ return -fADCpedestalECA + amp * fADCchannelECA ;
+
}
//____________________________________________________________________________
if(strstr(option,"print"))
Print("") ;
- //AliEMCALGetter * gime = AliEMCALGetter::Instance() ;
AliRunLoader *rl = AliRunLoader::GetRunLoader();
AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(rl->GetDetectorLoader("EMCAL"));
+ //Get calibration parameters from file or digitizer default values.
+ GetCalibrationParameters() ;
+
if (fLastEvent == -1)
fLastEvent = rl->GetNumberOfEvents() - 1;
Int_t nEvents = fLastEvent - fFirstEvent + 1;
rl->LoadDigits("EMCAL");
for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) {
rl->GetEvent(ievent);
- GetCalibrationParameters() ;
fNumberOfECAClusters = 0;
-
- MakeClusters() ;
+
+ if(strstr(option,"pseudo"))
+ MakeClusters("pseudo") ; //both types
+ else
+ MakeClusters("") ; //only the real clusters
if(fToUnfold)
MakeUnfolding() ;
if(strstr(option,"tim")){
gBenchmark->Stop("EMCALClusterizer");
printf("Exec took %f seconds for Clusterizing %f seconds per event",
- gBenchmark->GetCpuTime("EMCALClusterizer"), gBenchmark->GetCpuTime("EMCALClusterizer")/nEvents ) ;
+ gBenchmark->GetCpuTime("EMCALClusterizer"), gBenchmark->GetCpuTime("EMCALClusterizer")/nEvents );
}
- SaveHists();
-
}
//____________________________________________________________________________
AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"));
TClonesArray *digits = emcalLoader->Digits();
- /*
- AliEMCALGetter * gime = AliEMCALGetter::Instance() ;
- TClonesArray * digits = gime->Digits() ;
- */
gMinuit->mncler(); // Reset Minuit's list of paramters
gMinuit->SetPrintLevel(-1) ; // No Printout
Int_t iDigit ;
- AliEMCALGeometry * geom = AliEMCALGeometry::GetInstance(); //gime->EMCALGeometry() ;
-
for(iDigit = 0; iDigit < nDigits; iDigit++){
digit = maxAt[iDigit];
Int_t relid[2] ;
Float_t x = 0.;
Float_t z = 0.;
- geom->AbsToRelNumbering(digit->GetId(), relid) ;
- geom->PosInAlice(relid, x, z) ;
+ fGeom->AbsToRelNumbering(digit->GetId(), relid) ;
+ fGeom->PosInAlice(relid, x, z) ;
Float_t energy = maxAtEnergy[iDigit] ;
//____________________________________________________________________________
void AliEMCALClusterizerv1::GetCalibrationParameters()
{
- // Gets the parameters for the calibration from the digitizer
- //AliEMCALGetter * gime = AliEMCALGetter::Instance() ;
- AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"));
-
- if ( !emcalLoader->Digitizer() )
- emcalLoader->LoadDigitizer();
- AliEMCALDigitizer * dig = dynamic_cast<AliEMCALDigitizer*>(emcalLoader->Digitizer());
-
- fADCchannelECA = dig->GetECAchannel() ;
- fADCpedestalECA = dig->GetECApedestal();
-//PH cout<<"ChannelECA, peds "<<fADCchannelECA<<" "<<fADCpedestalECA<<endl;
+ // Set calibration parameters:
+ // if calibration database exists, they are read from database,
+ // otherwise, they are taken from digitizer.
+ //
+ // It is a user responsilibity to open CDB before reconstruction,
+ // for example:
+ // AliCDBStorage* storage = AliCDBManager::Instance()->GetStorage("local://CalibDB");
+
+ //Check if calibration is stored in data base
+ if(AliCDBManager::Instance()->IsDefaultStorageSet()){
+ AliCDBEntry *entry = (AliCDBEntry*)
+ AliCDBManager::Instance()->Get("EMCAL/Calib/Data");
+ if (entry) fCalibData = (AliEMCALCalibData*) entry->GetObject();
+ }
+ if(!fCalibData)
+ {
+ //If calibration is not available use default parameters
+ //Loader
+ AliEMCALLoader *emcalLoader =
+ dynamic_cast<AliEMCALLoader*>(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"));
+ if ( !emcalLoader->Digitizer() )
+ emcalLoader->LoadDigitizer();
+ AliEMCALDigitizer * dig = dynamic_cast<AliEMCALDigitizer*>(emcalLoader->Digitizer());
+
+ fADCchannelECA = dig->GetECAchannel() ;
+ fADCpedestalECA = dig->GetECApedestal();
+ }
}
//____________________________________________________________________________
// Make all memory allocations which can not be done in default constructor.
// Attach the Clusterizer task to the list of EMCAL tasks
- //AliEMCALGeometry * geom = AliEMCALGeometry::GetInstance() ;
AliRunLoader *rl = AliRunLoader::GetRunLoader();
- AliEMCALGeometry *geom = dynamic_cast<AliEMCAL*>(rl->GetAliRun()->GetDetector("EMCAL"))->GetGeometry();
- AliInfo(Form("geom 0x%x",geom));
+ fGeom = dynamic_cast<AliEMCAL*>(rl->GetAliRun()->GetDetector("EMCAL"))->GetGeometry();
+ fGeom->GetTransformationForSM(); // Global <-> Local
+ AliInfo(Form("geom 0x%x",fGeom));
-//Sub fNTowers = geom->GetNZ() * geom->GetNPhi() ;
- fNTowers =400;
if(!gMinuit)
gMinuit = new TMinuit(100) ;
- //Sub if ( !gime->Clusterizer() )
- //Sub gime->PostClusterizer(this);
- BookHists();
+
+ fHists = BookHists();
}
//____________________________________________________________________________
// Initializes the parameters for the Clusterizer
fNumberOfECAClusters = 0;
+ fNTowerInGroup = 36; //Produces maximum of 80 pseudoclusters per event
+
fECAClusteringThreshold = 0.5; // value obtained from Alexei
- fECALocMaxCut = 0.03;
+ fECALocMaxCut = 0.03; // ??
fECAW0 = 4.5 ;
fTimeGate = 1.e-8 ;
fToUnfold = kFALSE ;
fRecPointsInRun = 0 ;
- fMinECut = 0.3;
+ fMinECut = 0.01; // have to be tune
+
+ fCalibData = 0 ;
}
//____________________________________________________________________________
-Int_t AliEMCALClusterizerv1::AreNeighbours(AliEMCALDigit * d1, AliEMCALDigit * d2)const
+Int_t AliEMCALClusterizerv1::AreNeighbours(AliEMCALDigit * d1, AliEMCALDigit * d2) const
{
// Gives the neighbourness of two digits = 0 are not neighbour but continue searching
// = 1 are neighbour
- // = 2 are not neighbour but do not continue searching
+ // = 2 is in different SM, quit from searching
// neighbours are defined as digits having at least a common vertex
// The order of d1 and d2 is important: first (d1) should be a digit already in a cluster
// which is compared to a digit (d2) not yet in a cluster
- //AliEMCALGeometry * geom = AliEMCALGetter::Instance()->EMCALGeometry() ;
- AliEMCALGeometry * geom = AliEMCALGeometry::GetInstance() ;
-
- Int_t rv = 0 ;
-
- Int_t relid1[2] ;
- //Sub geom->AbsToRelNumbering(d1->GetId(), relid1) ;
- Int_t nSupMod=0;
- Int_t nTower=0;
- Int_t nIphi=0;
- Int_t nIeta=0;
- Int_t iphi=0;
- Int_t ieta=0;
- geom->GetCellIndex(d1->GetId(), nSupMod,nTower,nIphi,nIeta);
- geom->GetCellPhiEtaIndexInSModule(nSupMod,nTower,nIphi,nIeta, iphi,ieta);
- relid1[0]=ieta;
- relid1[1]=iphi;
-
-
- Int_t nSupMod1=0;
- Int_t nTower1=0;
- Int_t nIphi1=0;
- Int_t nIeta1=0;
- Int_t iphi1=0;
- Int_t ieta1=0;
- geom->GetCellIndex(d2->GetId(), nSupMod1,nTower1,nIphi1,nIeta1);
- geom->GetCellPhiEtaIndexInSModule(nSupMod1, nTower1,nIphi1,nIeta1, iphi1,ieta1);
- Int_t relid2[2] ;
- relid2[0]=ieta1;
- relid2[1]=iphi1;
-
- //Sub geom->AbsToRelNumbering(d2->GetId(), relid2) ;
-
+ static Int_t rv;
+ static Int_t nSupMod1=0, nTower1=0, nIphi1=0, nIeta1=0, iphi1=0, ieta1=0;
+ static Int_t nSupMod2=0, nTower2=0, nIphi2=0, nIeta2=0, iphi2=0, ieta2=0;
+ static Int_t rowdiff, coldiff;
+ rv = 0 ;
+
+ fGeom->GetCellIndex(d1->GetId(), nSupMod1,nTower1,nIphi1,nIeta1);
+ fGeom->GetCellIndex(d2->GetId(), nSupMod2,nTower2,nIphi2,nIeta2);
+ if(nSupMod1 != nSupMod2) return 2; // different SM
- Int_t rowdiff = TMath::Abs( relid1[0] - relid2[0] ) ;
- Int_t coldiff = TMath::Abs( relid1[1] - relid2[1] ) ;
+ fGeom->GetCellPhiEtaIndexInSModule(nSupMod1,nTower1,nIphi1,nIeta1, iphi1,ieta1);
+ fGeom->GetCellPhiEtaIndexInSModule(nSupMod2,nTower2,nIphi2,nIeta2, iphi2,ieta2);
+
+ rowdiff = TMath::Abs(iphi1 - iphi2);
+ coldiff = TMath::Abs(ieta1 - ieta2) ;
- if (( coldiff <= 1 ) && ( rowdiff <= 1 )){
- rv = 1 ;
- }
- else {
- if((relid2[0] > relid1[0]) && (relid2[1] > relid1[1]+1))
- rv = 2; // Difference in row numbers is too large to look further
- }
+ if (( coldiff <= 1 ) && ( rowdiff <= 1 )) rv = 1; // neighbours with at least commom vertex
- if (gDebug == 2 )
-if(rv==1)printf("AreNeighbours: neighbours=%d, id1=%d, relid1=%d,%d \n id2=%d, relid2=%d,%d \n",
- rv, d1->GetId(), relid1[0], relid1[1],
- d2->GetId(), relid2[0], relid2[1]) ;
+ if (gDebug == 2 && rv==1)
+ printf("AreNeighbours: neighbours=%d, id1=%d, relid1=%d,%d \n id2=%d, relid2=%d,%d \n",
+ rv, d1->GetId(), iphi1,ieta1, d2->GetId(), iphi2,ieta2);
return rv ;
}
+//____________________________________________________________________________
+Int_t AliEMCALClusterizerv1::AreInGroup(AliEMCALDigit * d1, AliEMCALDigit * d2) const
+{
+ // Tells whether two digits fall within the same supermodule and
+ // tower grouping. The number of towers in a group is controlled by
+ // the parameter nTowersInGroup
+ // = 0 are not in same group but continue searching
+ // = 1 same group
+ // = 2 is in different SM, quit from searching
+ // = 3 different tower group, quit from searching
+ //
+ // The order of d1 and d2 is important: first (d1) should be a digit
+ // already in a cluster which is compared to a digit (d2) not yet in a cluster
+
+ //JLK Question: does the quit from searching assume that the digits
+ //are ordered, so that once you are in a different SM, you'll not
+ //find another in the list that will match? How about my TowerGroup search?
+
+ static Int_t rv;
+ static Int_t nSupMod1=0, nTower1=0, nIphi1=0, nIeta1=0, iphi1=0, ieta1=0;
+ static Int_t nSupMod2=0, nTower2=0, nIphi2=0, nIeta2=0, iphi2=0, ieta2=0;
+ static Int_t towerGroup1 = -1, towerGroup2 = -1;
+ rv = 0 ;
+
+ fGeom->GetCellIndex(d1->GetId(), nSupMod1,nTower1,nIphi1,nIeta1);
+ fGeom->GetCellIndex(d2->GetId(), nSupMod2,nTower2,nIphi2,nIeta2);
+ if(nSupMod1 != nSupMod2) return 2; // different SM
+
+ static Int_t nTowerInSM = fGeom->GetNCellsInSupMod()/fGeom->GetNCellsInTower();
+
+ //figure out which tower grouping each digit belongs to
+ for(int it = 0; it < nTowerInSM/fNTowerInGroup; it++) {
+ if(nTower1 <= nTowerInSM - it*fNTowerInGroup) towerGroup1 = it;
+ if(nTower2 <= nTowerInSM - it*fNTowerInGroup) towerGroup2 = it;
+ }
+ if(towerGroup1 != towerGroup2) return 3; //different Towergroup
+
+ //same SM, same towergroup, we're happy
+ if(towerGroup1 == towerGroup2 && towerGroup2 >= 0)
+ rv = 1;
+
+ if (gDebug == 2 && rv==1)
+ printf("AreInGroup: neighbours=%d, id1=%d, relid1=%d,%d \n id2=%d, relid2=%d,%d \n",
+ rv, d1->GetId(), iphi1,ieta1, d2->GetId(), iphi2,ieta2);
+
+ return rv ;
+}
+
//____________________________________________________________________________
void AliEMCALClusterizerv1::Unload()
{
aECARecPoints->Sort() ;
- for(index = 0; index < aECARecPoints->GetEntries(); index++)
+ for(index = 0; index < aECARecPoints->GetEntries(); index++) {
(dynamic_cast<AliEMCALRecPoint *>(aECARecPoints->At(index)))->SetIndexInList(index) ;
+ (dynamic_cast<AliEMCALRecPoint *>(aECARecPoints->At(index)))->Print();
+ }
Int_t bufferSize = 32000 ;
Int_t splitlevel = 0 ;
treeR->Fill() ;
emcalLoader->WriteRecPoints("OVERWRITE");
- //emcalLoader->WriteClusterizer("OVERWRITE");
- emcalLoader->WriteReconstructioner("OVERWRITE");
+
}
//____________________________________________________________________________
-void AliEMCALClusterizerv1::MakeClusters()
+void AliEMCALClusterizerv1::MakeClusters(char* option)
{
// Steering method to construct the clusters stored in a list of Reconstructed Points
// A cluster is defined as a list of neighbour digits
TObjArray * aECARecPoints = emcalLoader->RecPoints() ;
- AliEMCALGeometry * geom = AliEMCALGeometry::GetInstance();
- if (geom==0)
+ if (fGeom==0)
AliFatal("Did not get geometry from EMCALLoader");
aECARecPoints->Clear();
- TClonesArray * digits = emcalLoader->Digits() ;
- TClonesArray * digitsC = dynamic_cast<TClonesArray*>(digits->Clone()) ;
+ //Start with pseudoclusters, if option
+ if(strstr(option,"pseudo")) {
+ TClonesArray * digits = emcalLoader->Digits() ;
+ TClonesArray * digitsC = dynamic_cast<TClonesArray*>(digits->Clone());
+
+ TIter nextdigit(digitsC) ;
+ AliEMCALDigit * digit;
+
+ AliEMCALRecPoint * recPoint = 0 ;
+ int ineb=0;
+ nextdigit.Reset();
+
+ // PseudoClusterization starts
+ while ( (digit = dynamic_cast<AliEMCALDigit *>(nextdigit())) ) { // scan over the list of digitsC
+ recPoint = 0 ;
+ TArrayI clusterECAdigitslist(1000); // what is this
+
+ if(fGeom->CheckAbsCellId(digit->GetId()) ) { //Is this an EMCAL digit? Just maing sure...
+ Int_t iDigitInECACluster = 0; // start a new Tower RecPoint
+ if(fNumberOfECAClusters >= aECARecPoints->GetSize()) aECARecPoints->Expand(2*fNumberOfECAClusters+1) ;
+ AliEMCALRecPoint * rp = new AliEMCALRecPoint("") ;
+ aECARecPoints->AddAt(rp, fNumberOfECAClusters) ;
+ recPoint = dynamic_cast<AliEMCALRecPoint *>(aECARecPoints->At(fNumberOfECAClusters)) ;
+ fNumberOfECAClusters++ ;
+
+ recPoint->SetClusterType(AliEMCALRecPoint::kPseudoCluster);
+
+ recPoint->AddDigit(*digit, digit->GetAmp()) ;
+ clusterECAdigitslist[iDigitInECACluster] = digit->GetIndexInList() ;
+ iDigitInECACluster++ ;
+ digitsC->Remove(digit) ;
+ AliDebug(1,Form("MakePseudoClusters: OK id = %d, adc = %f \n", digit->GetId(), digit->GetAmp()));
+ nextdigit.Reset(); // will start from beggining
+
+ AliEMCALDigit * digitN = 0; // digi neighbor
+ Int_t index = 0 ;
+
+ // Find the neighbours
+ while (index < iDigitInECACluster){ // scan over digits already in cluster
+ digit = (AliEMCALDigit*)digits->At(clusterECAdigitslist[index]);
+ index++ ;
+ while ( (digitN = (AliEMCALDigit *)nextdigit())) { // scan over the reduced list of digits
+ ineb = AreInGroup(digit, digitN); // call (digit,digitN) in THAT oder !!!!!
+ switch (ineb ) {
+ case 0 : // not a neighbour
+ break ;
+ case 1 : // are neighbours
+ recPoint->AddDigit(*digitN, digitN->GetAmp() ) ;
+ clusterECAdigitslist[iDigitInECACluster] = digitN->GetIndexInList() ;
+ iDigitInECACluster++ ;
+ digitsC->Remove(digitN) ;
+ break ;
+ case 2 : // different SM
+ break ;
+ case 3 : // different Tower group
+ break ;
+ } // switch
+ } // scan over the reduced list of digits
+ } // scan over digits already in cluster
+ nextdigit.Reset() ; // will start from beggining
+ }
+ }
+ if(recPoint) cout << "cl.e " << recPoint->GetEnergy() << endl;
+ delete digitsC ;
+ }
+
+ //Now do real clusters
+ TClonesArray * digits = emcalLoader->Digits() ;
+ TClonesArray * digitsC = dynamic_cast<TClonesArray*>(digits->Clone());
- // Clusterization starts
TIter nextdigit(digitsC) ;
AliEMCALDigit * digit;
- cout << "Outer Loop" << endl;
+ AliEMCALRecPoint * recPoint = 0 ;
+ int ineb=0;
+ nextdigit.Reset();
+
+ double e=0.0, ehs = 0.0;
+ while ( (digit = dynamic_cast<AliEMCALDigit *>(nextdigit())) ) { // clean up digits
+ e = Calibrate(digit->GetAmp(), digit->GetId());
+ AliEMCALHistoUtilities::FillH1(fHists, 10, digit->GetAmp());
+ AliEMCALHistoUtilities::FillH1(fHists, 11, e);
+ if(e < fMinECut ) digitsC->Remove(digit);
+ else ehs += e;
+ }
+ cout << " Number of digits " << digits->GetEntries() << " -> (e>" <<fMinECut <<")";
+ cout << digitsC->GetEntries()<< " ehs "<<ehs<<endl;
+
+ // Clusterization starts
+ // cout << "Outer Loop" << endl;
+ ineb=0;
+ nextdigit.Reset();
+ recPoint = 0 ;
while ( (digit = dynamic_cast<AliEMCALDigit *>(nextdigit())) ) { // scan over the list of digitsC
- AliEMCALRecPoint * clu = 0 ;
-
- TArrayI clusterECAdigitslist(50000);
-
-////////////////////////temp solution, embedding///////////////////
- int nSupMod=0, nTower=0, nIphi=0, nIeta=0;
- int iphi=0, ieta=0;
- geom->GetCellIndex(digit->GetId(), nSupMod,nTower,nIphi,nIeta);
- geom->GetCellPhiEtaIndexInSModule(nSupMod,nTower,nIphi,nIeta, iphi,ieta);
-
- //cout << "Some checking" << endl;
- if (geom->CheckAbsCellId(digit->GetId()) && (Calibrate(digit->GetAmp()+addOn[nSupMod-1][ieta-1][iphi-1]) > fECAClusteringThreshold ) ){
- //if(addOn[nSupMod-1][ieta-1][iphi-1]>0)cout<<"11 digit, add "<<ieta<<" "<<iphi<<" "<<addOn[nSupMod-1][ieta-1][iphi-1]<<" "<<digit->GetAmp()<<endl;
-// cout<<"crossed the threshold "<<endl;
- Int_t iDigitInECACluster = 0;
- // start a new Tower RecPoint
- if(fNumberOfECAClusters >= aECARecPoints->GetSize())
- aECARecPoints->Expand(2*fNumberOfECAClusters+1) ;
+ recPoint = 0 ;
+ TArrayI clusterECAdigitslist(1000); // what is this
+
+ if(fGeom->CheckAbsCellId(digit->GetId()) && (Calibrate(digit->GetAmp(), digit->GetId()) > fECAClusteringThreshold ) ){
+ Int_t iDigitInECACluster = 0; // start a new Tower RecPoint
+ if(fNumberOfECAClusters >= aECARecPoints->GetSize()) aECARecPoints->Expand(2*fNumberOfECAClusters+1) ;
AliEMCALRecPoint * rp = new AliEMCALRecPoint("") ;
- //rp->SetGeom(geom);
aECARecPoints->AddAt(rp, fNumberOfECAClusters) ;
-
clu = dynamic_cast<AliEMCALRecPoint *>(aECARecPoints->At(fNumberOfECAClusters)) ;
+
recPoint = dynamic_cast<AliEMCALRecPoint *>(aECARecPoints->At(fNumberOfECAClusters)) ;
fNumberOfECAClusters++ ;
- clu->AddDigit(*digit, Calibrate(digit->GetAmp()+addOn[nSupMod-1][ieta-1][iphi-1])) ;
+
+ recPoint->SetClusterType(AliEMCALRecPoint::kClusterv1);
+
+ recPoint->AddDigit(*digit, Calibrate(digit->GetAmp(), digit->GetId())) ;
clusterECAdigitslist[iDigitInECACluster] = digit->GetIndexInList() ;
iDigitInECACluster++ ;
-// cout<<" 1st setp:cluno, digNo "<<fNumberOfECAClusters<<" "<<iDigitInECACluster<<endl;
digitsC->Remove(digit) ;
- AliDebug(1,Form("MakeClusters: OK id = %d, ene = %f , thre = %f \n", digit->GetId(),Calibrate(digit->GetAmp()), fECAClusteringThreshold));
- nextdigit.Reset() ;
+ AliDebug(1,Form("MakeClusters: OK id = %d, ene = %f , thre = %f \n", digit->GetId(),
+ Calibrate(digit->GetAmp(),digit->GetId()), fECAClusteringThreshold));
+ nextdigit.Reset(); // will start from beggining
- AliEMCALDigit * digitN ;
+ AliEMCALDigit * digitN = 0; // digi neighbor
Int_t index = 0 ;
// Find the neighbours
digit = (AliEMCALDigit*)digits->At(clusterECAdigitslist[index]);
index++ ;
while ( (digitN = (AliEMCALDigit *)nextdigit())) { // scan over the reduced list of digits
- // cout<<"we have new digit "<<endl;
- // check that the digit is above the min E Cut
- geom->GetCellIndex(digitN->GetId(), nSupMod,nTower,nIphi,nIeta);
- geom->GetCellPhiEtaIndexInSModule(nSupMod,nTower,nIphi,nIeta, iphi,ieta);
- if( Calibrate(digitN->GetAmp()+addOn[nSupMod-1][ieta-1][iphi-1]) < fMinECut ) digitsC->Remove(digitN);
- //cout<<" new digit above ECut "<<endl;
- Int_t ineb = AreNeighbours(digit, digitN); // call (digit,digitN) in THAT oder !!!!!
-// cout<<" new digit neighbour?? "<<ineb<<endl;
- switch (ineb ) {
- case 0 : // not a neighbour
- break ;
- case 1 : // are neighbours
- //if(addOn[nSupMod-1][ieta-1][iphi-1]>0)cout<<"22 digit, add "<<nSupMod<<" "<<ieta<<" "<<iphi<<" "<<addOn[nSupMod-1][ieta-1][iphi-1]<<" "<<digit->GetAmp()<<endl;
- clu->AddDigit(*digitN, Calibrate( digitN->GetAmp()+addOn[nSupMod-1][ieta-1][iphi-1]) ) ;
- clusterECAdigitslist[iDigitInECACluster] = digitN->GetIndexInList() ;
- iDigitInECACluster++ ;
-// cout<<"when neighbour: cluno, digNo "<<digit->GetId()<<" "<<fNumberOfECAClusters<<" "<<iDigitInECACluster<<endl;
- digitsC->Remove(digitN) ;
-// break ;
-// case 2 : // too far from each other
-//Subh goto endofloop1;
-// cout<<"earlier go to end of loop"<<endl;
+ ineb = AreNeighbours(digit, digitN); // call (digit,digitN) in THAT oder !!!!!
+ switch (ineb ) {
+ case 0 : // not a neighbour
+ break ;
+ case 1 : // are neighbours
+ recPoint->AddDigit(*digitN, Calibrate(digitN->GetAmp(),digitN->GetId()) ) ;
+ clusterECAdigitslist[iDigitInECACluster] = digitN->GetIndexInList() ;
+ iDigitInECACluster++ ;
+ digitsC->Remove(digitN) ;
+ break ;
+ case 2 : // different SM
+ break ;
} // switch
- //cout<<"in nextDigit loop "<<fNumberOfECAClusters<<" "<<iDigitInECACluster<<endl;
- } // while digitN
- //cout << "Done neighbout searching" << endl;
- nextdigit.Reset() ;
- } // loop over ECA cluster
- } // energy threshold
- else if(Calibrate(digit->GetAmp()+addOn[nSupMod-1][ieta-1][iphi-1]) < fMinECut ){
- //if(addOn[nSupMod-1][ieta-1][iphi-1]>0)cout<<"33 digit, add "<<ieta<<" "<<iphi<<" "<<addOn[nSupMod-1][ieta-1][iphi-1]<<" "<<digit->GetAmp()<<endl;
- digitsC->Remove(digit);
+ } // scan over the reduced list of digits
+ } // scan over digits already in cluster
+ nextdigit.Reset() ; // will start from beggining
}
- //cout<<"after endofloop: cluno, digNo "<<fNumberOfECAClusters<<endl;
} // while digit
+ if(recPoint) cout << "cl.e " << recPoint->GetEnergy() << endl;
delete digitsC ;
+
AliDebug(1,Form("total no of clusters %d from %d digits",fNumberOfECAClusters,digits->GetEntriesFast()));
}
maxL2=lambda[1];
maxDis=rp->GetDispersion();
}
- pointE->Fill(rp->GetEnergy());
- pointL1->Fill(lambda[0]);
- pointL2->Fill(lambda[1]);
- pointDis->Fill(rp->GetDispersion());
- pointMult->Fill(rp->GetMultiplicity());
+ fPointE->Fill(rp->GetEnergy());
+ fPointL1->Fill(lambda[0]);
+ fPointL2->Fill(lambda[1]);
+ fPointDis->Fill(rp->GetDispersion());
+ fPointMult->Fill(rp->GetMultiplicity());
/////////////
for (Int_t iprimary=0; iprimary<nprimaries; iprimary++) {
printf("%d ", primaries[iprimary] ) ;
}
}
- MaxE->Fill(maxE);
- MaxL1->Fill(maxL1);
- MaxL2->Fill(maxL2);
- MaxDis->Fill(maxDis);
+ fMaxE->Fill(maxE);
+ fMaxL1->Fill(maxL1);
+ fMaxL2->Fill(maxL2);
+ fMaxDis->Fill(maxDis);
printf("\n-----------------------------------------------------------------------\n");
}
}
- void AliEMCALClusterizerv1::BookHists()
+TList* AliEMCALClusterizerv1::BookHists()
{
- pointE = new TH1F("pointE","point energy", 2000, 0.0, 150.);
- pointL1 = new TH1F("pointL1","point L1", 1000, 0.0, 3.);
- pointL2 = new TH1F("pointL2","point L2", 1000, 0.0, 3.);
- pointDis = new TH1F("pointDis","point Dis", 1000, 0.0, 3.);
- pointMult = new TH1F("pointMult","point Mult", 100, 0.0, 100.);
- digitAmp = new TH1F("digitAmp","Digit Amplitude", 2000, 0.0, 5000.);
- MaxE = new TH1F("maxE","Max point energy", 2000, 0.0, 150.);
- MaxL1 = new TH1F("maxL1","Max point L1", 1000, 0.0, 3.);
- MaxL2 = new TH1F("maxL2","Max point L2", 1000, 0.0, 3.);
- MaxDis = new TH1F("maxDis","Max point Dis", 1000, 0.0, 3.);
+ gROOT->cd();
+
+ fPointE = new TH1F("pointE","point energy", 2000, 0.0, 150.);
+ fPointL1 = new TH1F("pointL1","point L1", 1000, 0.0, 3.);
+ fPointL2 = new TH1F("pointL2","point L2", 1000, 0.0, 3.);
+ fPointDis = new TH1F("pointDis","point Dis", 1000, 0.0, 3.);
+ fPointMult = new TH1F("pointMult","point Mult", 100, 0.0, 100.);
+ fDigitAmp = new TH1F("digitAmp","Digit Amplitude", 2000, 0.0, 5000.);
+ fMaxE = new TH1F("maxE","Max point energy", 2000, 0.0, 150.);
+ fMaxL1 = new TH1F("maxL1","Max point L1", 1000, 0.0, 3.);
+ fMaxL2 = new TH1F("maxL2","Max point L2", 1000, 0.0, 3.);
+ fMaxDis = new TH1F("maxDis","Max point Dis", 1000, 0.0, 3.); // 9
+ //
+ new TH1F("adcOfDigits","adc of digits(threshold control)", 1001, -0.5, 1000.5); // 10
+ new TH1F("energyOfDigits","energy of digits(threshold control)", 1000, 0.0, 1.); // 11
+
+ return AliEMCALHistoUtilities::MoveHistsToList("EmcalClusterizerv1ControlHists", kFALSE);
}
-void AliEMCALClusterizerv1::SaveHists()
+
+void AliEMCALClusterizerv1::SaveHists(const char *fn)
{
- recofile=new TFile("reco.root","RECREATE");
- pointE->Write();
- pointL1->Write();
- pointL2->Write();
- pointDis->Write();
- pointMult->Write();
- digitAmp->Write();
- MaxE->Write();
- MaxL1->Write();
- MaxL2->Write();
- MaxDis->Write();
-recofile->Close();
+ AliEMCALHistoUtilities::SaveListOfHists(fHists, fn, kTRUE);
}
-void AliEMCALClusterizerv1::ReadFile()
+void AliEMCALClusterizerv1::Browse(TBrowser* b)
{
- return; // 3-jan-05
- FILE *fp = fopen("hijing1.dat","r");
- for(Int_t line=0;line<9113;line++){
- Int_t eg,l1,l2,sm;
- Int_t ncols0;
- ncols0 = fscanf(fp,"%d %d %d %d",&sm,&l1,&l2,&eg);
- // cout<<eg<<" "<<l1<<" "<<l2<<endl;
- addOn[sm-1][l1-1][l2-1]=eg;
- //addOn[sm-1][l1-1][l2-1]=0;
- }
+ if(fHists) b->Add(fHists);
+ TTask::Browse(b);
}
-
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff