/*
$Log$
+Revision 1.38 2001/03/07 14:04:51 barbera
+Some vector dimensions increased to cope with full events
+
Revision 1.37 2001/03/07 12:36:35 barbera
A change added in the tracking part to manage delta rays
cout << "AliITS::MakeTreeC" << endl;
- char *optC = strstr(option,"C");
+ const char *optC = strstr(option,"C");
if (optC && !fTreeC) fTreeC = new TTree("TC","Clusters in ITS");
else return;
AliDetector::MakeBranch(option,file);
- char *cD = strstr(option,"D");
- char *cR = strstr(option,"R");
+ const char *cD = strstr(option,"D");
+ const char *cR = strstr(option,"R");
if (cD) {
//
static Bool_t first=kTRUE;
static TFile *file;
- char *addBgr = strstr(option,"Add");
+ const char *addBgr = strstr(option,"Add");
if (addBgr ) {
Int_t ver = this->IsVersion();
if(ver!=5 && ver!=7) return;
- char *all = strstr(opt,"All");
- char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
+ const char *all = strstr(opt,"All");
+ const char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
Int_t nmodules;
InitModules(size,nmodules);
Int_t ver = this->IsVersion();
if(ver!=5) return;
- char *all = strstr(opt,"All");
- char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
+ const char *all = strstr(opt,"All");
+ const char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
static Bool_t first=kTRUE;
if (!TreeC() && first) {
Int_t ver = this->IsVersion();
if(ver!=5) return;
- char *all = strstr(opt,"All");
- char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
+ const char *all = strstr(opt,"All");
+ const char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
Int_t nmodules;
InitModules(size,nmodules);
// a specialized structure for ease of implementation.
/////////////////////////////////////////////////////////////////////////
#include <iostream.h>
+#include <fstream.h>
#include <TObjArray.h>
#include <TVector.h>
#include "AliITSgeomMatrix.h"
-class ifstream;
-class ofstream;
-
typedef enum {kSPD=0, kSDD=1, kSSD=2, kSSDp=3,kSDDp=4} AliITSDetector;
#include <TObject.h>
#include <TBRIK.h>
-class ostream;
-class istream;
class TShape;
class AliITSgeomSDD: public TObject {
//#include "AliITSgeomSDD.h"
-class ostream;
-class istream;
class AliITSgeomSDD256 : public AliITSgeomSDD {
//#include "AliITSgeomSDD.h"
-class ostream;
-class istream;
class AliITSgeomSDD300 : public AliITSgeomSDD {
#include <TObject.h>
#include <TBRIK.h>
-class ostream;
-class istream;
class TShape;
//#include "AliITSgeomSPD.h"
-class ostream;
-class istream;
class AliITSgeomSPD300 : public AliITSgeomSPD {
// temporary - this will migrate into the segmentation class
-class ostream;
-class istream;
class AliITSgeomSPD425Short : public AliITSgeomSPD {
// temporary - this will migrate into the segmentation class
-class ostream;
-class istream;
class AliITSgeomSPD425Long : public AliITSgeomSPD {
#include <TBRIK.h>
class TShape;
-class ostream;
-class istream;
class AliITSgeomSSD : public TObject {
//#include "AliITSgeomSSD.h"
-class ostream;
-class istream;
class TShape;
//#include "AliITSgeomSSD.h"
-class ostream;
-class istream;
class TShape;
//#include "AliITSgeomSSD.h"
-class ostream;
-class istream;
class TShape;
class AliITSgeomSSD75and275 : public AliITSgeomSSD {
**************************************************************************/
/*
$Log$
+Revision 1.48 2001/03/06 00:01:36 morsch
+Add Digits2Reco() and FindClusters()
+Adapt call of cluster finder to new STEER.
+
Revision 1.47 2001/03/05 08:38:36 morsch
Digitization related methods moved to AliMUONMerger.
AliDetector::MakeBranch(option,file);
- char *cD = strstr(option,"D");
- char *cR = strstr(option,"R");
- char *cH = strstr(option,"H");
+ const char *cD = strstr(option,"D");
+ const char *cR = strstr(option,"R");
+ const char *cH = strstr(option,"H");
if (fPadHits && gAlice->TreeH() && cH) {
gAlice->MakeBranchInTree(gAlice->TreeH(),
**************************************************************************/
/*
$Log$
+Revision 1.8 2001/01/26 22:05:41 morsch
+Unresolved conflicts resolved.
+
Revision 1.7 2001/01/26 21:54:46 morsch
Use access functions to AliMUONHit member data.
// call tracking fortran program
static Bool_t first=kTRUE;
static TFile *pFile;
- char *addBackground = strstr(option,"Add");
+ const char *addBackground = strstr(option,"Add");
if (addBackground ) { // only in case of background with geant hits
if(first) {
class AliPHOSDigit : public AliDigitNew {
- friend class ostream& operator << ( ostream& , const AliPHOSDigit&) ;
+ friend ostream& operator << ( ostream& , const AliPHOSDigit&) ;
public:
void AliPHOSv1::MakeBranch(Option_t* opt, char *file)
{
- char *cH ;
+ const char *cH ;
// Create new branche in the current Root Tree in the digit Tree
AliDetector::MakeBranch(opt) ;
char branchname[10];
sprintf(branchname,"%s",GetName());
- char *cd = strstr(opt,"R");
+ const char *cd = strstr(opt,"R");
if (fFastRecParticles && gAlice->TreeR() && cd) {
gAlice->MakeBranchInTree(gAlice->TreeR(),
/*
$Log$
+Revision 1.13 2001/01/26 20:02:43 hristov
+Major upgrade of AliRoot code
+
Revision 1.12 2000/12/04 08:48:18 alibrary
Fixing problems in the HEAD
{
// Create Tree branches for the PMD
- char *cR = strstr(option,"R");
+ const char *cR = strstr(option,"R");
AliDetector::MakeBranch(option,file);
/*
$Log$
+ Revision 1.45 2001/02/27 22:11:46 jbarbosa
+ Testing TreeS, removing of output.
+
Revision 1.44 2001/02/27 15:19:12 jbarbosa
Transition to SDigits.
AliDetector::MakeBranch(option,file);
- char *cH = strstr(option,"H");
- char *cD = strstr(option,"D");
- char *cR = strstr(option,"R");
+ const char *cH = strstr(option,"H");
+ const char *cD = strstr(option,"D");
+ const char *cR = strstr(option,"R");
//char *cS = strstr(option,"S");
if (cH) {
static Bool_t first=kTRUE;
static TFile *pFile;
- char *addBackground = strstr(option,"Add");
+ const char *addBackground = strstr(option,"Add");
Int_t particle;
FILE* points; //these will be the digits...
/*
$Log$
+Revision 1.17 2001/01/26 19:59:53 hristov
+Major upgrade of AliRoot code
+
Revision 1.16 2001/01/17 10:56:08 hristov
Corrections to destructors
AliDetector::MakeBranch(option,file);
- char *cD = strstr(option,"D");
+ const char *cD = strstr(option,"D");
if (cD) {
digits = new AliSTARTdigit();
/*
$Log$
+Revision 1.11 2001/01/26 19:58:46 hristov
+Major upgrade of AliRoot code
+
Revision 1.10 2001/01/17 10:50:50 hristov
Corrections to destructors
sprintf(branchname,"%s",GetName());
//
// Get the pointer to the header
- char *cH = strstr(option,"H");
+ const char *cH = strstr(option,"H");
//
if (fHits && gAlice->TreeH() && cH) {
gAlice->MakeBranchInTree(gAlice->TreeH(),
branchname, &fHits, fBufferSize, file) ;
}
- char *cD = strstr(option,"D");
+ const char *cD = strstr(option,"D");
if (cD) {
if (file) {
//ZDC part -------------------------------------------------------------------
- static const Float_t kG1=20.03;
- static const Float_t kFDIP=-37.34;
- static const Float_t kFDIMU=6.;
- static const Float_t kFCORN2=-9.4;
+ const Float_t kG1=20.03;
+ const Float_t kFDIP=-37.34;
+ const Float_t kFDIMU=6.;
+ const Float_t kFCORN2=-9.4;
//
// ZBEG Beginning of the inner triplet
// D1BEG Beginning of separator dipole 1
// D2BEG Beginning of separator dipole 2
// CORBEG Corrector dipole beginning (because of dimuon arm)
//
- static const Float_t kCORBEG2=19216,kCOREND2=kCORBEG2+170, kCOR2RA2=4.5*4.5;
+ const Float_t kCORBEG2=19216.,kCOREND2=kCORBEG2+170., kCOR2RA2=4.5*4.5;
//
- static const Float_t kZBEG=2300;
- static const Float_t kZ1BEG=kZBEG+ 0,kZ1END=kZ1BEG+630,kZ1RA2=3.5*3.5;
- static const Float_t kZ2BEG=kZBEG+ 880,kZ2END=kZ2BEG+550,kZ2RA2=3.5*3.5;
- static const Float_t kZ3BEG=kZBEG+1530,kZ3END=kZ3BEG+550,kZ3RA2=3.5*3.5;
- static const Float_t kZ4BEG=kZBEG+2430,kZ4END=kZ4BEG+630,kZ4RA2=3.5*3.5;
- static const Float_t kD1BEG=5838.3 ,kD1END=kD1BEG+945,kD1RA2=4.5*4.5;
- static const Float_t kD2BEG=12147.6 ,kD2END=kD2BEG+945,kD2RA2=4.5*4.5;
+ const Float_t kZBEG=2300.;
+ const Float_t kZ1BEG=kZBEG+ 0.,kZ1END=kZ1BEG+630.,kZ1RA2=3.5*3.5;
+ const Float_t kZ2BEG=kZBEG+ 880.,kZ2END=kZ2BEG+550.,kZ2RA2=3.5*3.5;
+ const Float_t kZ3BEG=kZBEG+1530.,kZ3END=kZ3BEG+550.,kZ3RA2=3.5*3.5;
+ const Float_t kZ4BEG=kZBEG+2430.,kZ4END=kZ4BEG+630.,kZ4RA2=3.5*3.5;
+ const Float_t kD1BEG=5838.3 ,kD1END=kD1BEG+945.,kD1RA2=4.5*4.5;
+ const Float_t kD2BEG=12147.6 ,kD2END=kD2BEG+945.,kD2RA2=4.5*4.5;
//
- static const Float_t kXCEN1D2=-9.7 ,kYCEN1D2=0.;
- static const Float_t kXCEN2D2=9.7 ,kYCEN2D2=0.;
+ const Float_t kXCEN1D2=-9.7 ,kYCEN1D2=0.;
+ const Float_t kXCEN2D2=9.7 ,kYCEN2D2=0.;
//ZDC part -------------------------------------------------------------------
/*
$Log$
+Revision 1.58 2001/03/09 14:27:26 morsch
+Fix for multiple events per file: inhibit decrease of size of fParticleFileMap.
+
Revision 1.57 2001/02/23 17:40:23 buncic
All trees needed for simulation created in RunMC(). TreeR and its branches
are now created in new RunReco() method.
char hname[30];
//
// Analyse options
- char *oK = strstr(option,"K");
- char *oH = strstr(option,"H");
- char *oE = strstr(option,"E");
- char *oD = strstr(option,"D");
- char *oR = strstr(option,"R");
- char *oS = strstr(option,"S");
+ const char *oK = strstr(option,"K");
+ const char *oH = strstr(option,"H");
+ const char *oE = strstr(option,"E");
+ const char *oD = strstr(option,"D");
+ const char *oR = strstr(option,"R");
+ const char *oS = strstr(option,"S");
//
if (oK && !fTreeK) {
// can contain blank separated list of detector names).
- char *oS = strstr(option,"S");
- char *oD = strstr(option,"D");
- char *oR = strstr(option,"R");
+ const char *oS = strstr(option,"S");
+ const char *oD = strstr(option,"D");
+ const char *oR = strstr(option,"R");
gAlice->GetEvent(0);
/*
$Log$
+Revision 1.18 2001/01/26 19:57:42 hristov
+Major upgrade of AliRoot code
+
Revision 1.17 2000/10/19 09:58:14 vicinanz
Updated Hits2Digit procedure
Char_t branchname[10];
sprintf(branchname,"%s",GetName());
- char *D = strstr(option,"D");
+ const char *D = strstr(option,"D");
if (fDigits && gAlice->TreeD() && D){
gAlice->MakeBranchInTree(gAlice->TreeD(),
/*
$Log$
+Revision 1.31 2001/03/12 08:21:50 kowal2
+Corrected C++ bug in the material definitions
+
Revision 1.30 2001/03/01 17:34:47 kowal2
Correction due to the accuracy problem
AliDetector::MakeBranch(option,file);
- char *d = strstr(option,"D");
+ const char *d = strstr(option,"D");
if (fDigits && gAlice->TreeD() && d) {
gAlice->MakeBranchInTree(gAlice->TreeD(),
sprintf(branchname,"%s2",GetName());
//
// Get the pointer to the header
- char *cH = strstr(option,"H");
+ const char *cH = strstr(option,"H");
//
if (fTrackHits && gAlice->TreeH() && cH) {
AliObjectBranch * branch = new AliObjectBranch(branchname,"AliTPCTrackHits",&fTrackHits,
/*
$Log$
+Revision 1.14 2001/02/23 16:48:28 coppedis
+Correct bug in ZEM hit definition
+
Revision 1.13 2001/02/07 18:07:41 coppedis
Modif for splitting
Char_t branchname[10];
sprintf(branchname,"%s",GetName());
- char *cD = strstr(opt,"D");
+ const char *cD = strstr(opt,"D");
if (gAlice->TreeD() && cD) {