--- PamVMC/include/PamVMCDigMgr.h 2009/02/19 16:50:36 1.1 +++ PamVMC/include/PamVMCDigMgr.h 2009/06/12 18:39:17 1.5 @@ -39,8 +39,8 @@ SetDIG("TSPA", new PamVMCTrkDig()); SetDIG("S4",new PamVMCS4Dig()); SetDIG("NDTI",new PamVMCNDDig()); - SetDIG("RunHeader", new PamVMCDigRunHeader()); - SetDIG("RunTrailer", new PamVMCDigRunTrailer()); + //SetDIG("RunHeader", new PamVMCDigRunHeader()); + //SetDIG("RunTrailer", new PamVMCDigRunTrailer()); } public: @@ -53,18 +53,20 @@ return (PamVMCDigitizer*)fdigmap(name); } + /* Setting pointer to random objects for all Digitizers */ /* All digitizers load calibrations and calibrate */ - void LoadCalib(){ + void Initialize(TRandom* random){ TMapIter *n= (TMapIter *)fdigmap.MakeIterator(); - TObject *o; while( o=(TObject *) n->Next()) { + TObject *o; while( (o=(TObject *) n->Next())) { ((PamVMCDigitizer *)fdigmap.GetValue(o))->LoadCalib(); + ((PamVMCDigitizer *)fdigmap.GetValue(o))->SetRandom(random); } } /* This calls digitization for all detector */ void Digitize(Int_t EventNo, Int_t PrimaryPDG){ TMapIter *n= (TMapIter *)fdigmap.MakeIterator(); - TObject *o; while( o=(TObject *) n->Next()) { + TObject *o; while( (o=(TObject *) n->Next())) { ((PamVMCDigitizer *)fdigmap.GetValue(o))->Digitize(); } @@ -112,7 +114,7 @@ to raw-file only once, when run is over */ void FinishRun(){ TMapIter *n= (TMapIter *)fdigmap.MakeIterator(); - TObject *o; while( o=(TObject *) n->Next()) { + TObject *o; while( (o=(TObject *) n->Next())) { ((PamVMCDigitizer *)fdigmap.GetValue(o))->FinishRun(); } } @@ -121,7 +123,7 @@ void PrintCollections(){ TMapIter *n= (TMapIter *)fdigmap.MakeIterator(); - TObject *o; while( o=(TObject *) n->Next()) { + TObject *o; while( (o=(TObject *) n->Next())) { ((PamVMCDigitizer *)fdigmap.GetValue(o))->PrintCollections(); } }